Skip to contentSkip to conversation

arm64: dts: msm8916: Conform to updated PSCI bindings

PATCH New Ulf Hansson 1 participant 3 messages Mar 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover arm64: dts: msm8916: Conform to updated PSCI bindings

The PSCI DT binding was recently updated to fix some errors and so was also the related domain-idle-state DT binding. Therefore, this series updates the msm8916 to conform to these updates.

Ulf Hansson (2):
arm64: dts: msm8916: Conform to the domain-idle-state binding
arm64: dts: msm8916: Conform to the nodename pattern PSCI subnodes

 arch/arm64/boot/dts/qcom/msm8916.dtsi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 arm64: dts: msm8916: Conform to the domain-idle-state binding

As the domain-idle-state DT binding got converted to the json-schema, a few minor changes were introduced. For example, the states needs to be specified within a separate node, named domain-idle-states. Let's conform to the updated binding.

This also silence the below errors for msm8916 from of 'make dtbs_check':
idle-states: cluster-retention:compatible:0: 'arm,idle-state' was expected
idle-states: cluster-gdhs:compatible:0: 'arm,idle-state' was expected

---
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/qcom/msm8916.dtsi +3 -0
index a88a15f2352b..e7ff8701eed3 100644
@@ -165,6 +165,9 @@
 				min-residency-us = <2000>;
 				local-timer-stop;
 			};
+		};
+
+		domain-idle-states {
 
 			CLUSTER_RET: cluster-retention {
 				compatible = "domain-idle-state";
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 arm64: dts: msm8916: Conform to the nodename pattern PSCI subnodes

In reply to Ulf Hansson

Subnodes for PSCI should start with "power-domain-", so let's adopt to this.

---
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +5 -5
index e7ff8701eed3..2fdc6aa61b83 100644
@@ -191,31 +191,31 @@
 		compatible = "arm,psci-1.0";
 		method = "smc";
 
-		CPU_PD0: cpu-pd0 {
+		CPU_PD0: power-domain-cpu0 {
 			#power-domain-cells = <0>;
 			power-domains = <&CLUSTER_PD>;
 			domain-idle-states = <&CPU_SLEEP_0>;
 		};
 
-		CPU_PD1: cpu-pd1 {
+		CPU_PD1: power-domain-cpu1 {
 			#power-domain-cells = <0>;
 			power-domains = <&CLUSTER_PD>;
 			domain-idle-states = <&CPU_SLEEP_0>;
 		};
 
-		CPU_PD2: cpu-pd2 {
+		CPU_PD2: power-domain-cpu2 {
 			#power-domain-cells = <0>;
 			power-domains = <&CLUSTER_PD>;
 			domain-idle-states = <&CPU_SLEEP_0>;
 		};
 
-		CPU_PD3: cpu-pd3 {
+		CPU_PD3: power-domain-cpu3 {
 			#power-domain-cells = <0>;
 			power-domains = <&CLUSTER_PD>;
 			domain-idle-states = <&CPU_SLEEP_0>;
 		};
 
-		CLUSTER_PD: cluster-pd {
+		CLUSTER_PD: power-domain-cluster {
 			#power-domain-cells = <0>;
 			domain-idle-states = <&CLUSTER_RET>, <&CLUSTER_PWRDN>;
 		};
Signature · 1 line
2.20.1