[PATCH 1/2] arm64: dts: meson-g12b: move G12B thermal nodes to meson-g12b.dtsi

[Neil Armstrong]

The G12B thermal nodes should be in the meson-g12b.dtsi file.

Fixes: 195f140318a9 ("arm64: dts: meson: g12b: add cooling properties")
Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12.dtsi  | 23 ---------------------
 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 22 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi 
b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
index 783e5a397f86..e932205badea 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
@@ -355,29 +355,6 @@
        };
 };
 
-&cpu_thermal {
-       cooling-maps {
-               map0 {
-                       trip = <&cpu_passive>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu1 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu100 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu101 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu102 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu103 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>;
-               };
-               map1 {
-                       trip = <&cpu_hot>;
-                       cooling-device = <&cpu0 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu1 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu100 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu101 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu102 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
-                                        <&cpu103 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>;
-               };
-       };
-};
-
 &ethmac {
        power-domains = <&pwrc PWRC_G12A_ETH_ID>;
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 
b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
index 6dbc3968045b..9b8548e5f6e5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
@@ -113,3 +113,25 @@
        compatible = "amlogic,g12b-clkc";
 };
 
+&cpu_thermal {
+       cooling-maps {
+               map0 {
+                       trip = <&cpu_passive>;
+                       cooling-device = <&cpu0 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu1 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu100 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu101 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu102 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu103 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>;
+               };
+               map1 {
+                       trip = <&cpu_hot>;
+                       cooling-device = <&cpu0 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu1 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu100 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu101 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu102 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>,
+                                        <&cpu103 THERMAL_NO_LIMIT 
THERMAL_NO_LIMIT>;
+               };
+       };
+};
-- 
2.22.0