ARM: berlin: remove useless chip and system ctrl compatibles

Now that the rework to have one sub-node per device in the chip and
system controllers is done, their dedicated compatible can be removed.

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 b2ffaf42c815ea4ad66ff071a088bd1327e7c42d..4d2f52759b072601e04907bfd06da9487ca20ec1 100644 (file)
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -351,7 +351,7 @@ sata-phy@1 {
                };
 
                chip: chip-control@ea0000 {
-                       compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon";
+                       compatible = "simple-mfd", "syscon";
                        reg = <0xea0000 0x400>;
 
                        chip_clk: clock {
@@ -454,7 +454,7 @@ uart2: serial@b000 {
                        };
 
                        sysctrl: system-controller@d000 {
-                               compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon";
+                               compatible = "simple-mfd", "syscon";
                                reg = <0xd000 0x100>;
 
                                sys_pinctrl: pin-controller {

diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 6ff0194cf77d37cf2ea781680f436408dc1b16a5..0a70d47663b25c9dced4f88b532088e175a6ed27 100644 (file)
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -295,7 +295,7 @@ aic: interrupt-controller@3000 {
                };
 
                chip: chip-control@ea0000 {
-                       compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon";
+                       compatible = "simple-mfd", "syscon";
                        reg = <0xea0000 0x400>;
 
                        chip_clk: clock {
@@ -401,7 +401,7 @@ uart1: serial@a000 {
                        };
 
                        sysctrl: system-controller@d000 {
-                               compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon";
+                               compatible = "simple-mfd", "syscon";
                                reg = <0xd000 0x100>;
 
                                sys_pinctrl: pin-controller {

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 97ec09a7a91d033184e933a168b7275d0e59c5f7..83ecfbea233ee3b23e8c40ba132140c274b52ea0 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -360,7 +360,7 @@ aic: interrupt-controller@3800 {
                };
 
                chip: chip-control@ea0000 {
-                       compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";
+                       compatible = "simple-mfd", "syscon";
                        reg = <0xea0000 0x400>, <0xdd0170 0x10>;
 
                        chip_clk: clock {
@@ -538,7 +538,7 @@ porte: gpio-port@4 {
                        };
 
                        sysctrl: pin-controller@d000 {
-                               compatible = "marvell,berlin2q-system-ctrl", "simple-mfd", "syscon";
+                               compatible = "simple-mfd", "syscon";
                                reg = <0xd000 0x100>;
 
                                sys_pinctrl: pin-controller {