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

Commit b1fc5195 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clock-rpm: Support deferred probe for enable_rpm_scaling"

parents 0b173bf8 c5c53314

arch/arm/mach-msm/clock-rpm-8974.c

+3 −1
Original line number Diff line number Diff line
@@ -304,7 +304,9 @@ static int msm_rpmcc_8974_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	enable_rpm_scaling();

	ret = enable_rpm_scaling();

	if (ret < 0)

		return ret;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc_base");

	if (!res) {

drivers/clk/qcom/clock-rpm-8916.c

+3 −1
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ static int msm_rpmcc_8916_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	enable_rpm_scaling();

	ret = enable_rpm_scaling();

	if (ret)

		return ret;



	res =  platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc_base");

	if (!res) {

drivers/clk/qcom/clock-rpm-plutonium.c

+3 −1
Original line number Diff line number Diff line
@@ -252,7 +252,9 @@ static int msm_rpmcc_plutonium_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	enable_rpm_scaling();

	ret = enable_rpm_scaling();

	if (ret < 0)

		return ret;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc_base");

	if (!res) {

drivers/clk/qcom/clock-rpm.c

+13 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static enum handoff rpm_clk_handoff(struct clk *clk) 
#define RPM_MISC_CLK_TYPE	0x306b6c63

#define RPM_SCALING_ENABLE_ID	0x2



void enable_rpm_scaling(void)

int enable_rpm_scaling(void)

{

	int rc, value = 0x1;

	struct msm_rpm_kvp kvp = {
@@ -281,11 +281,21 @@ void enable_rpm_scaling(void) 


	rc = msm_rpm_send_message_noirq(MSM_RPM_CTX_SLEEP_SET,

			RPM_MISC_CLK_TYPE, RPM_SCALING_ENABLE_ID, &kvp, 1);

	WARN(rc < 0, "RPM clock scaling (sleep set) did not enable!\n");

	if (rc < 0) {

		if (rc != -EPROBE_DEFER)

			WARN(1, "RPM clock scaling (sleep set) did not enable!\n");

		return rc;

	}



	rc = msm_rpm_send_message_noirq(MSM_RPM_CTX_ACTIVE_SET,

			RPM_MISC_CLK_TYPE, RPM_SCALING_ENABLE_ID, &kvp, 1);

	WARN(rc < 0, "RPM clock scaling (active set) did not enable!\n");

	if (rc < 0) {

		if (rc != -EPROBE_DEFER)

			WARN(1, "RPM clock scaling (active set) did not enable!\n");

		return rc;

	}



	return 0;

}



struct clk_ops clk_ops_rpm = {

include/soc/qcom/clock-rpm.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline struct rpm_clk *to_rpm_clk(struct clk *clk) 
 * RPM scaling enable function used for target that has an RPM resource for

 * rpm clock scaling enable.

 */

void enable_rpm_scaling(void);

int enable_rpm_scaling(void);



extern struct clk_rpmrs_data clk_rpmrs_data_smd;