@@ -266,10 +266,13 @@
};
};
- 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>;
+
+ ap_thermal: ap-thermal {
+ compatible = "marvell,armada-ap806-thermal";
+ };
};
};
};
@@ -170,12 +170,6 @@
interrupts = <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>;
@@ -216,6 +210,15 @@
};
};
+ CP110_LABEL(syscon1): system-controller@400000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x400000 0x1000>;
+
+ CP110_LABEL(thermal): thermal@400070 {
+ compatible = "marvell,armada-cp110-thermal";
+ };
+ };
+
CP110_LABEL(usb3_0): usb3@500000 {
compatible = "marvell,armada-8k-xhci",
"generic-xhci";
New bindings impose to declare the thermal IP from within a new syscon. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 11 +++++++---- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-)