ARM: berlin: move reset to simple-mfd nodes

Now with a proper platform driver for reset and simple-mfd, move to
the new marvell,berlin-reset node.

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 245527abb77c95ae6efdc9f8c859017cc932edfe..1e92511f8582880f384edb24d2e16539090b0478 100644 (file)
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -353,7 +353,6 @@ sata-phy@1 {
                chip: chip-control@ea0000 {
                        compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon";
                        #clock-cells = <1>;
-                       #reset-cells = <2>;
                        reg = <0xea0000 0x400>;
                        clocks = <&refclk>;
                        clock-names = "refclk";
@@ -362,6 +361,11 @@ emmc_pmux: emmc-pmux {
                                groups = "G26";
                                function = "emmc";
                        };
+
+                       chip_rst: reset {
+                               compatible = "marvell,berlin2-reset";
+                               #reset-cells = <2>;
+                       };
                };
 
                apb@fc0000 {

diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index cccc23b45a26ec417b2e0aacd02339b6d019691b..5f8bfcdedceb7821f6dd48e77c1ae5c87b38079e 100644 (file)
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -84,7 +84,7 @@ usb_phy0: usb-phy@b74000 {
                        compatible = "marvell,berlin2cd-usb-phy";
                        reg = <0xb74000 0x128>;
                        #phy-cells = <0>;
-                       resets = <&chip 0x178 23>;
+                       resets = <&chip_rst 0x178 23>;
                        status = "disabled";
                };
 
@@ -92,7 +92,7 @@ usb_phy1: usb-phy@b78000 {
                        compatible = "marvell,berlin2cd-usb-phy";
                        reg = <0xb78000 0x128>;
                        #phy-cells = <0>;
-                       resets = <&chip 0x178 24>;
+                       resets = <&chip_rst 0x178 24>;
                        status = "disabled";
                };
 
@@ -297,7 +297,6 @@ aic: interrupt-controller@3000 {
                chip: chip-control@ea0000 {
                        compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon";
                        #clock-cells = <1>;
-                       #reset-cells = <2>;
                        reg = <0xea0000 0x400>;
                        clocks = <&refclk>;
                        clock-names = "refclk";
@@ -306,6 +305,11 @@ uart0_pmux: uart0-pmux {
                                groups = "G6";
                                function = "uart0";
                        };
+
+                       chip_rst: reset {
+                               compatible = "marvell,berlin2-reset";
+                               #reset-cells = <2>;
+                       };
                };
 
                usb0: usb@ed0000 {

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index a515b54bb3e532d120f1c93fe8e4dc99f97ee951..a27d03a2b5fa3b47350081fb373f9969076b08ff 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -127,7 +127,7 @@ usb_phy2: phy@a2f400 {
                        compatible = "marvell,berlin2-usb-phy";
                        reg = <0xa2f400 0x128>;
                        #phy-cells = <0>;
-                       resets = <&chip 0x104 14>;
+                       resets = <&chip_rst 0x104 14>;
                        status = "disabled";
                };
 
@@ -145,7 +145,7 @@ usb_phy0: phy@b74000 {
                        compatible = "marvell,berlin2-usb-phy";
                        reg = <0xb74000 0x128>;
                        #phy-cells = <0>;
-                       resets = <&chip 0x104 12>;
+                       resets = <&chip_rst 0x104 12>;
                        status = "disabled";
                };
 
@@ -153,7 +153,7 @@ usb_phy1: phy@b78000 {
                        compatible = "marvell,berlin2-usb-phy";
                        reg = <0xb78000 0x128>;
                        #phy-cells = <0>;
-                       resets = <&chip 0x104 13>;
+                       resets = <&chip_rst 0x104 13>;
                        status = "disabled";
                };
 
@@ -362,7 +362,6 @@ aic: interrupt-controller@3800 {
                chip: chip-control@ea0000 {
                        compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";
                        #clock-cells = <1>;
-                       #reset-cells = <2>;
                        reg = <0xea0000 0x400>, <0xdd0170 0x10>;
                        clocks = <&refclk>;
                        clock-names = "refclk";
@@ -376,6 +375,11 @@ twsi1_pmux: twsi1-pmux {
                                groups = "G7";
                                function = "twsi1";
                        };
+
+                       chip_rst: reset {
+                               compatible = "marvell,berlin2-reset";
+                               #reset-cells = <2>;
+                       };
                };
 
                ahci: sata@e90000 {