Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 684fa85f authored by Harshal Trivedi's avatar Harshal Trivedi
Browse files

Revert "msm: ipa: add offline charging support" 



This reverts commit 536e0056

To resolve boot-up crash on 8992 due to RPM dependency.

Change-Id: I789b616be70abe2a728f91a1495f9410918d17c5
Signed-off-by: default avatarHarshal Trivedi <htrivedi@codeaurora.org>
parent 9f6f9250

drivers/platform/msm/ipa/ipa_qmi_service.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -587,7 +587,7 @@ static void ipa_q6_clnt_svc_arrive(struct work_struct *work) 
		return;

	}

	qmi_modem_init_fin = true;

	ipa_proxy_clk_unvote();

	ipa_q6_init_done();

	IPAWANDBG("complete, qmi_modem_init_fin : %d\n",

		qmi_modem_init_fin);

drivers/platform/msm/ipa/ipa_utils.c

+4 −18
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -4416,32 +4416,18 @@ bool ipa_is_client_handle_valid(u32 clnt_hdl) 
EXPORT_SYMBOL(ipa_is_client_handle_valid);



/**

 * ipa_proxy_clk_unvote() - called to remove IPA clock proxy vote

 * ipa_q6_init_done() - called when q6 ipa initialization is done

 *

 * Return value: none

 */

void ipa_proxy_clk_unvote(void)

void ipa_q6_init_done(void)

{

	if (ipa_is_ready() && ipa_ctx->q6_proxy_clk_vote_valid) {

		ipa_dec_client_disable_clks();

		ipa_ctx->q6_proxy_clk_vote_valid = false;

	}

}

EXPORT_SYMBOL(ipa_proxy_clk_unvote);



/**

 * ipa_proxy_clk_vote() - called to add IPA clock proxy vote

 *

 * Return value: none

 */

void ipa_proxy_clk_vote(void)

{

	if (ipa_is_ready() && !ipa_ctx->q6_proxy_clk_vote_valid) {

		ipa_inc_client_enable_clks();

		ipa_ctx->q6_proxy_clk_vote_valid = true;

	}

}

EXPORT_SYMBOL(ipa_proxy_clk_vote);

EXPORT_SYMBOL(ipa_q6_init_done);



/**

 * ipa_get_hw_type() - Return IPA HW version

drivers/platform/msm/ipa/rmnet_ipa.c

+0 −10
Original line number Diff line number Diff line
@@ -1821,10 +1821,6 @@ static int ipa_wwan_probe(struct platform_device *pdev) 
		goto config_err;

	}

	atomic_set(&is_initialized, 1);

	if (!atomic_read(&is_ssr)) {

		/* offline charging mode */

		ipa_proxy_clk_unvote();

	}

	atomic_set(&is_ssr, 0);



	pr_info("rmnet_ipa completed initialization\n");
@@ -2016,12 +2012,6 @@ static int ssr_notifier_cb(struct notifier_block *this, 
			pr_info("IPA AFTER_POWERUP handling is complete\n");

			return NOTIFY_DONE;

		}

		if (SUBSYS_BEFORE_POWERUP == code) {

			pr_info("IPA received MPSS BEFORE_POWERUP\n");

			ipa_proxy_clk_vote();

			pr_info("IPA BEFORE_POWERUP handling is complete\n");

			return NOTIFY_DONE;

		}

	}

	return NOTIFY_DONE;

}

include/linux/ipa.h

+3 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1188,8 +1188,7 @@ int ipa_get_ep_mapping(enum ipa_client_type client); 


bool ipa_is_ready(void);



void ipa_proxy_clk_vote(void);

void ipa_proxy_clk_unvote(void);

void ipa_q6_init_done(void);



enum ipa_hw_type ipa_get_hw_type(void);
@@ -1773,11 +1772,7 @@ static inline bool ipa_is_ready(void) 
	return false;

}



static inline void ipa_proxy_clk_vote(void)

{

}



static inline void ipa_proxy_clk_unvote(void)

static inline void ipa_q6_init_done(void)

{

}