aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/berlin2.dtsi
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2015-05-16 00:50:40 +0200
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-05-18 17:52:39 +0200
commit432257287c01a7f8bd40c443959ebf9e846852f0 (patch)
treedbe8ff0b5c919ba5b1c94e8801dac28b249e0a34 /arch/arm/boot/dts/berlin2.dtsi
parentreset: berlin: convert to a platform driver (diff)
downloadlinux-dev-432257287c01a7f8bd40c443959ebf9e846852f0.tar.xz
linux-dev-432257287c01a7f8bd40c443959ebf9e846852f0.zip
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/berlin2.dtsi')
-rw-r--r--arch/arm/boot/dts/berlin2.dtsi6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index 245527abb77c..1e92511f8582 100644
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -353,7 +353,6 @@
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 @@
groups = "G26";
function = "emmc";
};
+
+ chip_rst: reset {
+ compatible = "marvell,berlin2-reset";
+ #reset-cells = <2>;
+ };
};
apb@fc0000 {