ARM: dove: add common pinmux functions to DT

This adds common dedicated and gpio pinmux functions to SoC pinctrl
node. It also relocates pinctrl references to corresponding DT nodes.

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

diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 955188f..525fb45 100644 (file)
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -42,6 +42,8 @@
                        regulator-always-on;
                        regulator-boot-on;
                        gpio = <&gpio0 1 0>;
+                       pinctrl-0 = <&pmx_gpio_1>;
+                       pinctrl-names = "default";
                };
        };
 
@@ -110,6 +112,7 @@
        status = "okay";
        /* sdio0 card detect is connected to wrong pin on CuBox */
        cd-gpios = <&gpio0 12 1>;
+       pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
 };
 
 &spi0 {
@@ -122,23 +125,3 @@
                reg = <0>;
        };
 };
-
-&pinctrl {
-       pinctrl-0 = <&pmx_gpio_1 &pmx_gpio_12>;
-       pinctrl-names = "default";
-
-       pmx_gpio_1: pmx-gpio-1 {
-               marvell,pins = "mpp1";
-               marvell,function = "gpio";
-       };
-
-       pmx_gpio_12: pmx-gpio-12 {
-               marvell,pins = "mpp12";
-               marvell,function = "gpio";
-       };
-
-       pmx_gpio_18: pmx-gpio-18 {
-               marvell,pins = "mpp18";
-               marvell,function = "gpio";
-       };
-};