浏览代码

arm64: dts: Fix various entry-method properties to reflect documentation

The idle-states binding documentation[1] mentions that the
'entry-method' property is required on 64-bit platforms and must be
set to "psci".

commit a13f18f59d26 ("Documentation: arm: Fix typo in the idle-states
bindings examples") attempted to fix this earlier but clearly more is
needed.

Fix the cpu-capacity.txt documentation that uses the incorrect value so
we don't get copy-paste errors like these. Clarify the language in
idle-states.txt by removing the reference to the psci bindings that
might be causing this confusion.

Finally, fix devicetrees of various boards to reflect current
documentation.

[1] Documentation/devicetree/bindings/arm/idle-states.txt (see
idle-states node)

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Amit Kucheria 7 年之前
父节点
当前提交
e9880240e4

+ 1 - 1
Documentation/devicetree/bindings/arm/cpu-capacity.txt

@@ -94,7 +94,7 @@ cpus {
 	};
 	};
 
 
 	idle-states {
 	idle-states {
-		entry-method = "arm,psci";
+		entry-method = "psci";
 
 
 		CPU_SLEEP_0: cpu-sleep-0 {
 		CPU_SLEEP_0: cpu-sleep-0 {
 			compatible = "arm,idle-state";
 			compatible = "arm,idle-state";

+ 2 - 2
Documentation/devicetree/bindings/arm/idle-states.txt

@@ -237,8 +237,8 @@ processor idle states, defined as device tree nodes, are listed.
 		Value type: <stringlist>
 		Value type: <stringlist>
 		Usage and definition depend on ARM architecture version.
 		Usage and definition depend on ARM architecture version.
 			# On ARM v8 64-bit this property is required and must
 			# On ARM v8 64-bit this property is required and must
-			  be one of:
-			   - "psci" (see bindings in [2])
+			  be:
+			   - "psci"
 			# On ARM 32-bit systems this property is optional
 			# On ARM 32-bit systems this property is optional
 
 
 The nodes describing the idle states (state) can only be defined within the
 The nodes describing the idle states (state) can only be defined within the

+ 1 - 1
arch/arm64/boot/dts/arm/juno-r1.dts

@@ -63,7 +63,7 @@
 		};
 		};
 
 
 		idle-states {
 		idle-states {
-			entry-method = "arm,psci";
+			entry-method = "psci";
 
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
 				compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/arm/juno-r2.dts

@@ -63,7 +63,7 @@
 		};
 		};
 
 
 		idle-states {
 		idle-states {
-			entry-method = "arm,psci";
+			entry-method = "psci";
 
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
 				compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/arm/juno.dts

@@ -62,7 +62,7 @@
 		};
 		};
 
 
 		idle-states {
 		idle-states {
-			entry-method = "arm,psci";
+			entry-method = "psci";
 
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
 				compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi

@@ -79,7 +79,7 @@
 		 * PSCI node is not added default, U-boot will add missing
 		 * PSCI node is not added default, U-boot will add missing
 		 * parts if it determines to use PSCI.
 		 * parts if it determines to use PSCI.
 		 */
 		 */
-		entry-method = "arm,psci";
+		entry-method = "psci";
 
 
 		CPU_PH20: cpu-ph20 {
 		CPU_PH20: cpu-ph20 {
 			compatible = "arm,idle-state";
 			compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

@@ -121,7 +121,7 @@
 		 * PSCI node is not added default, U-boot will add missing
 		 * PSCI node is not added default, U-boot will add missing
 		 * parts if it determines to use PSCI.
 		 * parts if it determines to use PSCI.
 		 */
 		 */
-		entry-method = "arm,psci";
+		entry-method = "psci";
 
 
 		CPU_PH20: cpu-ph20 {
 		CPU_PH20: cpu-ph20 {
 			compatible = "arm,idle-state";
 			compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

@@ -117,7 +117,7 @@
 		 * PSCI node is not added default, U-boot will add missing
 		 * PSCI node is not added default, U-boot will add missing
 		 * parts if it determines to use PSCI.
 		 * parts if it determines to use PSCI.
 		 */
 		 */
-		entry-method = "arm,psci";
+		entry-method = "psci";
 
 
 		CPU_PH20: cpu-ph20 {
 		CPU_PH20: cpu-ph20 {
 			compatible = "arm,idle-state";
 			compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/mediatek/mt2712e.dtsi

@@ -119,7 +119,7 @@
 		};
 		};
 
 
 		idle-states {
 		idle-states {
-			entry-method = "arm,psci";
+			entry-method = "psci";
 
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
 				compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/sprd/sc9860.dtsi

@@ -114,7 +114,7 @@
 	};
 	};
 
 
 	idle-states{
 	idle-states{
-		entry-method = "arm,psci";
+		entry-method = "psci";
 
 
 		CORE_PD: core_pd {
 		CORE_PD: core_pd {
 			compatible = "arm,idle-state";
 			compatible = "arm,idle-state";

+ 1 - 1
arch/arm64/boot/dts/xilinx/zynqmp.dtsi

@@ -58,7 +58,7 @@
 		};
 		};
 
 
 		idle-states {
 		idle-states {
-			entry-method = "arm,psci";
+			entry-method = "psci";
 
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
 				compatible = "arm,idle-state";