arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon

New bindings impose to declare the thermal IP from within a new syscon.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 176e38d548727ddbac73e0c88a6ba01f6ace1e37..27930394249d663ef95cc3e9d96cac4df71ca7e4 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -247,10 +247,16 @@
                                };
                        };
 
-                       ap_thermal: thermal@6f808c {
-                               compatible = "marvell,armada-ap806-thermal";
-                               reg = <0x6f808c 0x4>,
-                                     <0x6f8084 0x8>;
+                       ap_syscon1: system-controller@6f8000 {
+                               compatible = "syscon", "simple-mfd";
+                               reg = <0x6f8000 0x1000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               ap_thermal: thermal-sensor@80 {
+                                       compatible = "marvell,armada-ap806-thermal";
+                                       reg = <0x80 0x10>;
+                               };
                        };
                };
        };

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index 840c8454d03e3e81770a718e8e6aa17f53298ec6..70a784de3e0649935faedb1a42f44ac62224bfce 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -162,12 +162,6 @@
                        interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
                };
 
-               CP110_LABEL(thermal): thermal@400078 {
-                       compatible = "marvell,armada-cp110-thermal";
-                       reg = <0x400078 0x4>,
-                       <0x400070 0x8>;
-               };
-
                CP110_LABEL(syscon0): system-controller@440000 {
                        compatible = "syscon", "simple-mfd";
                        reg = <0x440000 0x2000>;
@@ -208,6 +202,18 @@
                        };
                };
 
+               CP110_LABEL(syscon1): system-controller@400000 {
+                       compatible = "syscon", "simple-mfd";
+                       reg = <0x400000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       CP110_LABEL(thermal): thermal-sensor@70 {
+                               compatible = "marvell,armada-cp110-thermal";
+                               reg = <0x70 0x10>;
+                       };
+               };
+
                CP110_LABEL(usb3_0): usb3@500000 {
                        compatible = "marvell,armada-8k-xhci",
                        "generic-xhci";