ARM: Dove: Convert to DT GPIO and pinctrl

Following the ongoing conversion of Orion SoCs to DT, make use of
gpio and pinctrl drivers through DT. The main dtsi for Dove is prepared
to allow board specific descriptors to make use of pinctrl muxing.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ade7e924bef5faaf00de76c0354e025ed4371b35..ca2b4182061ae8c7240474bd39de87846a7e29dd 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -536,6 +536,8 @@ config ARCH_DOVE
        select CPU_V7
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
+       select PINCTRL
+       select PINCTRL_DOVE
        select PLAT_ORION_LEGACY
        select USB_ARCH_HAS_EHCI
        help

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 5a00022383e74d7e457c34be0331eb3edf7c0521..61f391412a5a60cd3ae310c9576d057df97f9e98 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -4,6 +4,12 @@
        compatible = "marvell,dove";
        model = "Marvell Armada 88AP510 SoC";
 
+       aliases {
+               gpio0 = &gpio0;
+               gpio1 = &gpio1;
+               gpio2 = &gpio2;
+       };
+
        soc@f1000000 {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -72,7 +78,8 @@
                        #gpio-cells = <2>;
                        gpio-controller;
                        reg = <0xd0400 0x20>;
-                       ngpio = <32>;
+                       ngpios = <32>;
+                       interrupt-controller;
                        interrupts = <12>, <13>, <14>, <60>;
                };
 
@@ -81,7 +88,8 @@
                        #gpio-cells = <2>;
                        gpio-controller;
                        reg = <0xd0420 0x20>;
-                       ngpio = <32>;
+                       ngpios = <32>;
+                       interrupt-controller;
                        interrupts = <61>;
                };
 
@@ -90,7 +98,12 @@
                        #gpio-cells = <2>;
                        gpio-controller;
                        reg = <0xe8400 0x0c>;
-                       ngpio = <8>;
+                       ngpios = <8>;
+               };
+
+               pinctrl: pinctrl@d0200 {
+                       compatible = "marvell,dove-pinctrl";
+                       reg = <0xd0200 0x10>;
                };
 
                spi0: spi@10600 {