ARM: dts: vf610: use new GPIO support

Use GPIO support by adding SD card detection configuration and
GPIO pinmux for Colibri's standard GPIO pins. Attach the GPIO
pins to the iomuxc node to get the GPIO pin settings applied.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi
index ab403679e6f34754882bf6747c4c3d5d089dd931..ab9616d7df9093f03bd004ef427a7fc1ef6b3091 100644 (file)
--- a/arch/arm/boot/dts/vf-colibri.dtsi
+++ b/arch/arm/boot/dts/vf-colibri.dtsi
@@ -31,6 +31,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc1>;
        bus-width = <4>;
+       cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
 };
 
 &fec1 {
@@ -76,6 +77,14 @@
 
 &iomuxc {
        vf610-colibri {
+               pinctrl_gpio_ext: gpio_ext {
+                       fsl,pins = <
+                               VF610_PAD_PTD10__GPIO_89        0x22ed /* EXT_IO_0 */
+                               VF610_PAD_PTD9__GPIO_88         0x22ed /* EXT_IO_1 */
+                               VF610_PAD_PTD26__GPIO_68        0x22ed /* EXT_IO_2 */
+                       >;
+               };
+
                pinctrl_esdhc1: esdhc1grp {
                        fsl,pins = <
                                VF610_PAD_PTA24__ESDHC1_CLK     0x31ef

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index ebc906bf2a581fd1248c894758191efc8ea1f2db..793a376fa265588bfa4c16ef83288fb3f34b5165 100644 (file)
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -123,6 +123,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc1>;
        bus-width = <4>;
+       cd-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 4e70833b6dd8830ab1f62200ac20740dd7abbded..505969ae8093d123a80adc613744c9735939f56b 100644 (file)
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -10,6 +10,7 @@
 #include "vf610-pinfunc.h"
 #include <dt-bindings/clock/vf610-clock.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        aliases {