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

Commit e7df2e93 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: Remove non-psci properties for sdm845/670"

parents 1c818316 bdf541df

arch/arm64/boot/dts/qcom/sdm670-pm.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 


				qcom,pm-cpu-level@0 { /* C1 */

					reg = <0>;

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

					label = "wfi";

					qcom,psci-cpu-mode = <0x1>;

					qcom,latency-us = <43>;

					qcom,ss-power = <454>;
@@ -103,7 +103,7 @@ 


				qcom,pm-cpu-level@1 { /* C2D */

					reg = <1>;

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

					label = "ret";

					qcom,psci-cpu-mode = <0x2>;

					qcom,latency-us = <119>;

					qcom,ss-power = <449>;
@@ -113,7 +113,7 @@ 


				qcom,pm-cpu-level@2 {  /* C3 */

					reg = <2>;

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

					label = "pc";

					qcom,psci-cpu-mode = <0x3>;

					qcom,latency-us = <461>;

					qcom,ss-power = <436>;
@@ -125,7 +125,7 @@ 


				qcom,pm-cpu-level@3 {  /* C4 */

					reg = <3>;

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

					label = "rail-pc";

					qcom,psci-cpu-mode = <0x4>;

					qcom,latency-us = <531>;

					qcom,ss-power = <400>;
@@ -145,7 +145,7 @@ 


				qcom,pm-cpu-level@0 { /* C1 */

					reg = <0>;

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

					label = "wfi";

					qcom,psci-cpu-mode = <0x1>;

					qcom,latency-us = <43>;

					qcom,ss-power = <454>;
@@ -155,7 +155,7 @@ 


				qcom,pm-cpu-level@1 { /* C2D */

					reg = <1>;

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

					label = "ret";

					qcom,psci-cpu-mode = <0x2>;

					qcom,latency-us = <116>;

					qcom,ss-power = <449>;
@@ -165,7 +165,7 @@ 


				qcom,pm-cpu-level@2 {  /* C3 */

					reg = <2>;

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

					label = "pc";

					qcom,psci-cpu-mode = <0x3>;

					qcom,latency-us = <621>;

					qcom,ss-power = <436>;
@@ -177,7 +177,7 @@ 


				qcom,pm-cpu-level@3 {  /* C4 */

					reg = <3>;

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

					label = "rail-pc";

					qcom,psci-cpu-mode = <0x4>;

					qcom,latency-us = <1061>;

					qcom,ss-power = <400>;

arch/arm64/boot/dts/qcom/sdm845-pm.dtsi

+10 −11
Original line number Diff line number Diff line
@@ -9,20 +9,18 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#include <dt-bindings/interrupt-controller/arm-gic.h>



&soc {

	qcom,lpm-levels {

		compatible = "qcom,lpm-levels";

		qcom,use-psci;

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,pm-cluster@0 {

			reg = <0>;

			#address-cells = <1>;

			#size-cells = <0>;

			label = "L3";

			qcom,spm-device-names = "L3";

			qcom,psci-mode-shift = <4>;

			qcom,psci-mode-mask = <0xfff>;
@@ -84,6 +82,7 @@ 
				qcom,is-reset;

				qcom,notify-rpm;

			};



			qcom,pm-cpu@0 {

				#address-cells = <1>;

				#size-cells = <0>;
@@ -93,7 +92,7 @@ 


				qcom,pm-cpu-level@0 { /* C1 */

					reg = <0>;

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

					label = "wfi";

					qcom,psci-cpu-mode = <0x1>;

					qcom,latency-us = <43>;

					qcom,ss-power = <454>;
@@ -103,8 +102,8 @@ 


				qcom,pm-cpu-level@1 { /* C2D */

					reg = <1>;

					label = "ret";

					qcom,psci-cpu-mode = <0x2>;

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

					qcom,latency-us = <119>;

					qcom,ss-power = <449>;

					qcom,energy-overhead = <78456>;
@@ -113,7 +112,7 @@ 


				qcom,pm-cpu-level@2 {  /* C3 */

					reg = <2>;

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

					label = "pc";

					qcom,psci-cpu-mode = <0x3>;

					qcom,latency-us = <461>;

					qcom,ss-power = <436>;
@@ -125,7 +124,7 @@ 


				qcom,pm-cpu-level@3 {  /* C4 */

					reg = <3>;

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

					label = "rail-pc";

					qcom,psci-cpu-mode = <0x4>;

					qcom,latency-us = <531>;

					qcom,ss-power = <400>;
@@ -145,7 +144,7 @@ 


				qcom,pm-cpu-level@0 { /* C1 */

					reg = <0>;

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

					label = "wfi";

					qcom,psci-cpu-mode = <0x1>;

					qcom,latency-us = <43>;

					qcom,ss-power = <454>;
@@ -155,8 +154,8 @@ 


				qcom,pm-cpu-level@1 { /* C2D */

					reg = <1>;

					label = "ret";

					qcom,psci-cpu-mode = <0x2>;

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

					qcom,latency-us = <116>;

					qcom,ss-power = <449>;

					qcom,energy-overhead = <78456>;
@@ -165,7 +164,7 @@ 


				qcom,pm-cpu-level@2 {  /* C3 */

					reg = <2>;

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

					label = "pc";

					qcom,psci-cpu-mode = <0x3>;

					qcom,latency-us = <621>;

					qcom,ss-power = <436>;
@@ -177,7 +176,7 @@ 


				qcom,pm-cpu-level@3 {  /* C4 */

					reg = <3>;

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

					label = "rail-pc";

					qcom,psci-cpu-mode = <0x4>;

					qcom,latency-us = <1061>;

					qcom,ss-power = <400>;