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

Commit 99c27b33 authored by Karthik Parsha's avatar Karthik Parsha
Browse files

ARM: dts: msm: Remove/Replace CCI, L2 and CPU retention 



CCI, L2 and CPU Retention is not supported in current hardware.
Replace CCI and L2 retention sequence. Remove CPU retention sequence.

Change-Id: I54b3a47f55fb91b70f3ee2e1c8089938976da849
Signed-off-by: default avatarKarthik Parsha <kparsha@codeaurora.org>
parent ff86e4ff

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

+12 −51
Original line number Diff line number Diff line
@@ -27,10 +27,8 @@ 
		qcom,phase-port = <0x1>;

		qcom,saw2-pmic-data2 = <0x00030000>; /* VDD_APC0 off */

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

		qcom,saw2-pmic-data4 = <0x02030070>; /* VDD_APC0 ret */

		qcom,pfm-port = <0x2>;

		qcom,saw2-spm-cmd-ret = [00 10 20 30 41 07 31 20 30 0b 10 00

			0f];

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

		qcom,saw2-spm-cmd-pc = [00 60 10 20 30 50 21 07 70 20 30 31

			50 0b 10 00 60 70 0f];

	};
@@ -46,8 +44,7 @@ 
		qcom,saw2-cfg = <0x01>;

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

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

		qcom,saw2-spm-cmd-ret = [18 7b 26 6b 40 18 03 2f 1b 18 7b 26

			6b 40 18 0f];

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

		qcom,saw2-spm-cmd-pc = [08 00 60 70 80 30 18 7b 26 6b 40 16 6b

			c0 e0 d0 18 03 2f 1b 70 80 50 18 7b d0 2b e0 3b c0 16

			6b 26 6b 40 18 4b 60 00 30 50 08 0f];
@@ -68,12 +65,10 @@ 
		qcom,vctl-timeout-us = <50>;

		qcom,vctl-port = <0x0>;

		qcom,phase-port = <0x1>;

		qcom,saw2-pmic-data2 = <0x00030000>; /* VDD_APC0 off */

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

		qcom,pfm-port = <0x2>;

		qcom,saw2-pmic-data2 = <0x00030000>; /* VDD_APC1 off */

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

		qcom,saw2-pmic-data4 = <0x02030070>; /* VDD_APC1 ret */

		qcom,saw2-spm-cmd-ret = [18 7b 26 6b 40 18 03 2f 1b 18 7b 26 6b

			40 18 0f];

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

		qcom,saw2-spm-cmd-pc = [08 00 60 70 80 30 18 7b 26 6b 40 16 6b

			c0 e0 d0 18 b0 21 03 2f 1b 31 b0 70 80 50 18 7b d0 2b

			e0 3b c0 16 6b 26 6b 40 18 4b 60 00 30 50 08 0f];
@@ -92,8 +87,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -115,8 +108,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -138,8 +129,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -161,8 +150,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -184,8 +171,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -207,8 +192,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -230,8 +213,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -253,8 +234,6 @@ 
		qcom,saw2-spm-dly = <0X3c100c00>;

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

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

		qcom,saw2-spm-cmd-ret = [50 2b b0 e0 a0 90 50 03 2f 0b 50

			2b 90 1b e0 1b a0 b0 50 0f];

		qcom,saw2-spm-cmd-spc = [00 40 50 2b 24 80 e0 a0 90 50 03

			2f 0b 30 50 2b 90 1b e0 1b a0 80 24 14 50 00 40 30

			0f];
@@ -286,7 +265,7 @@ 
				qcom,time-overhead = <100>;

			};



			qcom,pm-cluster-level@2{

			qcom,pm-cluster-level@1{

				reg = <1>;

				label = "system-cci-pc";

				qcom,spm-cci-mode = "pc";
@@ -325,7 +304,7 @@ 
					qcom,ss-power = <83>;

					qcom,energy-overhead = <2274420>;

					qcom,time-overhead = <6605>;

					qcom,min-child-idx = <3>;

					qcom,min-child-idx = <2>;

				};



				qcom,pm-cpu {
@@ -343,15 +322,6 @@ 


					qcom,pm-cpu-level@1 {

						reg = <1>;

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

						qcom,latency-us = <35>;

						qcom,ss-power = <542>;

						qcom,energy-overhead = <34920>;

						qcom,time-overhead = <40>;

					};



					qcom,pm-cpu-level@2 {

						reg = <2>;

						qcom,spm-cpu-mode = "standalone_pc";

						qcom,latency-us = <300>;

						qcom,ss-power = <476>;
@@ -360,8 +330,8 @@ 
						qcom,use-broadcast-timer;

					};



					qcom,pm-cpu-level@3 {

						reg = <3>;

					qcom,pm-cpu-level@2 {

						reg = <2>;

						qcom,spm-cpu-mode = "pc";

						qcom,latency-us = <500>;

						qcom,ss-power = <163>;
@@ -399,7 +369,7 @@ 
					qcom,ss-power = <83>;

					qcom,energy-overhead = <2274420>;

					qcom,time-overhead = <6605>;

					qcom,min-child-idx = <3>;

					qcom,min-child-idx = <2>;

				};



				qcom,pm-cpu {
@@ -417,15 +387,6 @@ 


					qcom,pm-cpu-level@1 {

						reg = <1>;

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

						qcom,latency-us = <35>;

						qcom,ss-power = <542>;

						qcom,energy-overhead = <34920>;

						qcom,time-overhead = <40>;

					};



					qcom,pm-cpu-level@2 {

						reg = <2>;

						qcom,spm-cpu-mode = "standalone_pc";

						qcom,latency-us = <300>;

						qcom,ss-power = <476>;
@@ -434,8 +395,8 @@ 
						qcom,use-broadcast-timer;

					};



					qcom,pm-cpu-level@3 {

						reg = <3>;

					qcom,pm-cpu-level@2 {

						reg = <2>;

						qcom,spm-cpu-mode = "pc";

						qcom,latency-us = <500>;

						qcom,ss-power = <163>;