ARM: berlin: prepare simple-mfd/syscon conversion of sys/chip ctrl nodes

The chip and system controller nodes will be handled by simple-mfd based
driver probing. Prepare the conversion by adding "simple-mfd" and "syscon"
compatibles to the corresponding nodes.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index 63d00a63cfa68003351fe6f1eeed28d4e4873f3e..245527abb77c95ae6efdc9f8c859017cc932edfe 100644 (file)
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -351,7 +351,7 @@
                };
 
                chip: chip-control@ea0000 {
-                       compatible = "marvell,berlin2-chip-ctrl";
+                       compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon";
                        #clock-cells = <1>;
                        #reset-cells = <2>;
                        reg = <0xea0000 0x400>;
@@ -442,7 +442,7 @@
                        };
 
                        sysctrl: system-controller@d000 {
-                               compatible = "marvell,berlin2-system-ctrl";
+                               compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon";
                                reg = <0xd000 0x100>;
 
                                uart0_pmux: uart0-pmux {

diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 81b670ac494ae5e7d147ba9530b00ccfaa8acd68..cccc23b45a26ec417b2e0aacd02339b6d019691b 100644 (file)
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -295,7 +295,7 @@
                };
 
                chip: chip-control@ea0000 {
-                       compatible = "marvell,berlin2cd-chip-ctrl";
+                       compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon";
                        #clock-cells = <1>;
                        #reset-cells = <2>;
                        reg = <0xea0000 0x400>;
@@ -389,7 +389,7 @@
                        };
 
                        sysctrl: system-controller@d000 {
-                               compatible = "marvell,berlin2cd-system-ctrl";
+                               compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon";
                                reg = <0xd000 0x100>;
                        };
 

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index be5397288d24f355ed2a2ce7f63bc5772d5ccdf9..a515b54bb3e532d120f1c93fe8e4dc99f97ee951 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -360,7 +360,7 @@
                };
 
                chip: chip-control@ea0000 {
-                       compatible = "marvell,berlin2q-chip-ctrl";
+                       compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";
                        #clock-cells = <1>;
                        #reset-cells = <2>;
                        reg = <0xea0000 0x400>, <0xdd0170 0x10>;
@@ -526,7 +526,7 @@
                        };
 
                        sysctrl: pin-controller@d000 {
-                               compatible = "marvell,berlin2q-system-ctrl";
+                               compatible = "marvell,berlin2q-system-ctrl", "simple-mfd", "syscon";
                                reg = <0xd000 0x100>;
 
                                uart0_pmux: uart0-pmux {