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

Commit de40aefd 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: Rename L2, CCI clock gating mode to wfi for MSM8994"

parents b1f38db4 81892a2f

arch/arm/boot/dts/qcom/msm8994-v1-pm.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
		qcom,saw2-pmic-data1 = <0x02030080>; /* VDD_APC0 on  */

		qcom,pfm-port = <0x2>;

		qcom,use-qchannel-for-pc;

		qcom,saw2-spm-cmd-ret = [00 03 00 0f];

		qcom,saw2-spm-cmd-wfi = [00 03 00 0f];

		qcom,saw2-spm-cmd-pc = [00 60 70 50 01 03 11 3f 3f 3f 3f 50 00

			60 70 0f];

	};
@@ -47,7 +47,7 @@ 
		qcom,saw2-spm-dly = <0x3c100c1c>;

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

		qcom,use-qchannel-for-pc;

		qcom,saw2-spm-cmd-ret = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-wfi = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-pc = [08 00 30 50 18 7b 26 6b 16 6b c0 e0 d0

			1f 18 03 2f 1b 18 7b d0 2b e0 3b c0 16 6b 26 6b 18 00

			30 50 08 0f];
@@ -72,7 +72,7 @@ 
		qcom,saw2-pmic-data1 = <0x02030080>; /* VDD_APC1 on  */

		qcom,pfm-port = <0x2>;

		qcom,use-qchannel-for-pc;

		qcom,saw2-spm-cmd-ret = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-wfi = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-pc = [08 00 30 50 18 7b 26 6b 16 6b c0 e0 d0

			18 b0 01 03 2f 1b 11 b0 3f 3f 3f 3f 18 7b d0 2b e0 3b

			c0 16 6b 26 6b 18 00 30 50 08 0f];
@@ -245,8 +245,8 @@ 


			qcom,pm-cluster-level@0{

				reg = <0>;

				label = "system-cci-retention";

				qcom,spm-cci-mode = "retention";

				label = "system-cci-wfi";

				qcom,spm-cci-mode = "wfi";

				qcom,latency-us = <45>;

				qcom,ss-power = <1000>;

				qcom,energy-overhead = <300000>;
@@ -276,8 +276,8 @@ 


				qcom,pm-cluster-level@0{

					reg = <0>;

					label = "a53-l2-retention";

					qcom,spm-l2-mode = "retention";

					label = "a53-l2-wfi";

					qcom,spm-l2-mode = "wfi";

					qcom,latency-us = <30>;

					qcom,ss-power = <1000>;

					qcom,energy-overhead = <300000>;
@@ -341,8 +341,8 @@ 


				qcom,pm-cluster-level@0{

					reg = <0>;

					label = "a57-l2-retention";

					qcom,spm-l2-mode = "retention";

					label = "a57-l2-wfi";

					qcom,spm-l2-mode = "wfi";

					qcom,latency-us = <40>;

					qcom,ss-power = <1000>;

					qcom,energy-overhead = <300000>;

arch/arm/boot/dts/qcom/msm8994-v2-pm.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
		qcom,saw2-pmic-data0 = <0x00030000>; /* VDD_APC0 off */

		qcom,saw2-pmic-data1 = <0x02030080>; /* VDD_APC0 on  */

		qcom,pfm-port = <0x2>;

		qcom,saw2-spm-cmd-ret = [00 03 00 0f];

		qcom,saw2-spm-cmd-wfi = [00 03 00 0f];

		qcom,saw2-spm-cmd-pc = [00 60 70 50 01 03 11 3f 3f 3f 3f 50 00

			60 70 0f];

	};
@@ -45,7 +45,7 @@ 
		qcom,saw2-cfg = <0x01>;

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

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

		qcom,saw2-spm-cmd-ret = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-wfi = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-pc = [08 00 30 50 18 7b 48 26 6b 16 6b c0 e2

			d2 5b 18 03 2f 1b 18 7b d2 2b e2 3b c0 16 6b 26 6b 48

			18 00 30 50 08 0f];
@@ -69,7 +69,7 @@ 
		qcom,saw2-pmic-data0 = <0x00030000>; /* VDD_APC1 off */

		qcom,saw2-pmic-data1 = <0x02030080>; /* VDD_APC1 on  */

		qcom,pfm-port = <0x2>;

		qcom,saw2-spm-cmd-ret = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-wfi = [03 2f 1b 0f];

		qcom,saw2-spm-cmd-pc = [08 00 30 50 18 7b 48 26 6b 16 6b c0 e2

			d2 5b 18 b0 01 03 2f 1b 11 b0 3f 3f 3f 3f 18 7b d2 2b

			e2 3b c0 16 6b 26 6b 48 18 00 30 50 08 0f];
@@ -234,8 +234,8 @@ 


			qcom,pm-cluster-level@0{

				reg = <0>;

				label = "system-cci-retention";

				qcom,spm-cci-mode = "retention";

				label = "system-cci-wfi";

				qcom,spm-cci-mode = "wfi";

				qcom,latency-us = <45>;

				qcom,ss-power = <1000>;

				qcom,energy-overhead = <300000>;
@@ -265,8 +265,8 @@ 


				qcom,pm-cluster-level@0{

					reg = <0>;

					label = "a53-l2-retention";

					qcom,spm-l2-mode = "retention";

					label = "a53-l2-wfi";

					qcom,spm-l2-mode = "wfi";

					qcom,latency-us = <30>;

					qcom,ss-power = <1000>;

					qcom,energy-overhead = <300000>;
@@ -330,8 +330,8 @@ 


				qcom,pm-cluster-level@0{

					reg = <0>;

					label = "a57-l2-retention";

					qcom,spm-l2-mode = "retention";

					label = "a57-l2-wfi";

					qcom,spm-l2-mode = "wfi";

					qcom,latency-us = <40>;

					qcom,ss-power = <1000>;

					qcom,energy-overhead = <300000>;