arm64: dts: a8k: enable cpuidle on A-8040 DB & mcbin boards

In addition, move a7040 cpuidle enablement to ap806 level, and disable it for A7040-PCAC in the board level. Change-Id: I3154d14dd38ef8248f556cf1e657e05fa861ed50 Signed-off-by: Igal Liberman <[email protected]> Reviewed-on: http://vgitil04.il.marvell.com:8080/56696 Reviewed-by: Omri Itach <[email protected]> Tested-by: Omri Itach <[email protected]>
MarvellEmbeddedProcessors · Jun 24, 2018 · 32ff68e · 32ff68e
1 parent b44da4b
commit 32ff68e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 19 deletions.
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-pcac.dts b/arch/arm64/boot/dts/marvell/armada-7040-pcac.dts
@@ -65,6 +65,22 @@
 		ethernet1 = &cp0_emac2;
 	};
 
+	cpus {
+		/delete-node/idle_states;
+		cpu@000 {
+			/delete-property/cpu-idle-states;
+		};
+		cpu@001 {
+			/delete-property/cpu-idle-states;
+		};
+		cpu@100 {
+			/delete-property/cpu-idle-states;
+		};
+		cpu@101 {
+			/delete-property/cpu-idle-states;
+		};
+	};
+
 	ap806 {
 		config-space {
 			spi0: spi@510600 {

diff --git a/arch/arm64/boot/dts/marvell/armada-7040.dtsi b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
@@ -99,21 +99,6 @@
 		gpio2 = &cp0_gpio1;
 	};
 
-	cpus {
-		cpu0: cpu@000 {
-			cpu-idle-states = <&CPU_SLEEP_0>;
-		};
-		cpu1: cpu@001 {
-			cpu-idle-states = <&CPU_SLEEP_0>;
-		};
-		cpu2: cpu@100 {
-			cpu-idle-states = <&CPU_SLEEP_0>;
-		};
-		cpu3: cpu@101 {
-			cpu-idle-states = <&CPU_SLEEP_0>;
-		};
-	};
-
 	ap806 {
 		config-space {
 			smmu: iommu@5000000 {

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-ocp.dts b/arch/arm64/boot/dts/marvell/armada-8040-ocp.dts
@@ -61,6 +61,22 @@
 		ethernet1 = &cp1_emac0;
 	};
 
+	cpus {
+		/delete-node/idle_states;
+		cpu@000 {
+			/delete-property/cpu-idle-states;
+		};
+		cpu@001 {
+			/delete-property/cpu-idle-states;
+		};
+		cpu@100 {
+			/delete-property/cpu-idle-states;
+		};
+		cpu@101 {
+			/delete-property/cpu-idle-states;
+		};
+	};
+
 	ap806 {
 		config-space {
 			serial@512000 {

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
@@ -62,7 +62,7 @@
 			operating-points-v2 = <&cluster0_opp>;
 			#cooling-cells = <2>; /* min followed by max */
 			enable-method = "psci";
-			cpu-idle-states;
+			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 		cpu1: cpu@001 {
 			device_type = "cpu";
@@ -71,7 +71,7 @@
 			clocks = <&ap806_clock 0>;
 			operating-points-v2 = <&cluster0_opp>;
 			enable-method = "psci";
-			cpu-idle-states;
+			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 		cpu2: cpu@100 {
 			device_type = "cpu";
@@ -81,7 +81,7 @@
 			operating-points-v2 = <&cluster1_opp>;
 			#cooling-cells = <2>; /* min followed by max */
 			enable-method = "psci";
-			cpu-idle-states;
+			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 		cpu3: cpu@101 {
 			device_type = "cpu";
@@ -90,7 +90,7 @@
 			clocks = <&ap806_clock 1>;
 			operating-points-v2 = <&cluster1_opp>;
 			enable-method = "psci";
-			cpu-idle-states;
+			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 	};