summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/berlin2cd.dtsi
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2015-05-16 01:50:40 +0300
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-05-18 18:52:39 +0300
commit432257287c01a7f8bd40c443959ebf9e846852f0 (patch)
treedbe8ff0b5c919ba5b1c94e8801dac28b249e0a34 /arch/arm/boot/dts/berlin2cd.dtsi
parentaed6f3cadc860ddeec598ed82041c1f3773071b1 (diff)
downloadlinux-432257287c01a7f8bd40c443959ebf9e846852f0.tar.xz
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>
Diffstat (limited to 'arch/arm/boot/dts/berlin2cd.dtsi')
-rw-r--r--arch/arm/boot/dts/berlin2cd.dtsi10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index cccc23b45a26..5f8bfcdedceb 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -84,7 +84,7 @@
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 @@
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 @@
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 @@
groups = "G6";
function = "uart0";
};
+
+ chip_rst: reset {
+ compatible = "marvell,berlin2-reset";
+ #reset-cells = <2>;
+ };
};
usb0: usb@ed0000 {