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

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

Merge "ARM: dts: msm: Do not set rpm handshake bit for MDMs"

parents 05e54d7a 1dbc8664

arch/arm/boot/dts/qcom/mdm9607-pm.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
		qcom,saw2-cfg = <0x1>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,supports-rpm-hs;

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [04 03 04 0f];

arch/arm/boot/dts/qcom/mdm9640-pm.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
		reg = <0xb009000 0x1000>;

		qcom,name = "cpu0";

		qcom,cpu = <&CPU0>;

		qcom,supports-rpm-hs;

		qcom,saw2-ver-reg = <0xfd0>;

		qcom,saw2-cfg = <0x101>;

		qcom,saw2-spm-dly= <0x401004>;

arch/arm/boot/dts/qcom/mdmcalifornium-pm.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
		reg = <0xb009000 0x1000>;

		qcom,name = "core0";

		qcom,cpu = <&CPU0>;

		qcom,supports-rpm-hs;

		qcom,saw2-ver-reg = <0xfd0>;

		qcom,saw2-cfg = <0x101>;

		qcom,saw2-spm-dly= <0x401004>;

drivers/cpuidle/lpm-levels.c

+6 −0
Original line number Diff line number Diff line
@@ -666,6 +666,9 @@ static int cluster_configure(struct lpm_cluster *cluster, int idx, 
		us = us + 1;

		do_div(us, USEC_PER_SEC/SCLK_HZ);

		msm_mpm_enter_sleep(us, from_idle, cpumask);



		if (cluster->no_saw_devices && !use_psci)

			msm_spm_set_rpm_hs(true);

	}



	/* Notify cluster enter event after successfully config completion */
@@ -790,6 +793,9 @@ static void cluster_unprepare(struct lpm_cluster *cluster, 


		lpm_wa_cx_unvote_send();

		msm_mpm_exit_sleep(from_idle);



		if (cluster->no_saw_devices && !use_psci)

			msm_spm_set_rpm_hs(false);

	}



	update_debug_pc_event(CLUSTER_EXIT, cluster->last_level,

drivers/soc/qcom/spm_devices.c

+8 −0
Original line number Diff line number Diff line
@@ -543,6 +543,14 @@ int msm_spm_set_low_power_mode(unsigned int mode, bool notify_rpm) 
}

EXPORT_SYMBOL(msm_spm_set_low_power_mode);



void msm_spm_set_rpm_hs(bool allow_rpm_hs)

{

	struct msm_spm_device *dev = &__get_cpu_var(msm_cpu_spm_device);



	dev->allow_rpm_hs = allow_rpm_hs;

}

EXPORT_SYMBOL(msm_spm_set_rpm_hs);



int msm_spm_config_low_power_mode_addr(struct msm_spm_device *dev,

		unsigned int mode, bool notify_rpm)

{