summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/berlin2cd.dtsi
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2015-05-16 02:18:07 +0300
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-05-18 19:10:07 +0300
commit630c986b102a22740d789e552171ba897e7c143d (patch)
tree0cb6c2fe72e86a364dba66f6627fe2fbf0ea7dee /arch/arm/boot/dts/berlin2cd.dtsi
parentf52bf55cba63811e1a9e16318557caa19670fbe0 (diff)
downloadlinux-630c986b102a22740d789e552171ba897e7c143d.tar.xz
ARM: berlin: move pinctrl to simple-mfd nodes
Now with proper support for simple-mfd probed pinctrl driver, move to the new soc-pinctrl and system-pinctrl nodes. 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.dtsi14
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 5f8bfcdedceb..7544fea43e3a 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -301,9 +301,13 @@
clocks = <&refclk>;
clock-names = "refclk";
- uart0_pmux: uart0-pmux {
- groups = "G6";
- function = "uart0";
+ soc_pinctrl: pin-controller {
+ compatible = "marvell,berlin2cd-soc-pinctrl";
+
+ uart0_pmux: uart0-pmux {
+ groups = "G6";
+ function = "uart0";
+ };
};
chip_rst: reset {
@@ -395,6 +399,10 @@
sysctrl: system-controller@d000 {
compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon";
reg = <0xd000 0x100>;
+
+ sys_pinctrl: pin-controller {
+ compatible = "marvell,berlin2cd-system-pinctrl";
+ };
};
sic: interrupt-controller@e000 {