diff options
author | Stefan Agner <stefan@agner.ch> | 2014-09-06 17:46:53 +0200 |
---|---|---|
committer | Stefan Agner <stefan@agner.ch> | 2014-09-12 13:45:33 +0200 |
commit | 427de4893354839617853edfbecb99e0df680170 (patch) | |
tree | de9fadf8024439a68d996b42b56ba5c085429aa0 | |
parent | c464c554ed66b092918c64de7ea5b4734b5603fb (diff) |
ARM: dts: vf610: Use new GPIO supportarchive/vf610-gpio
Use GPIO support by adding SD card detection configuration and
GPIO pinmux for Colibri's standard GPIO pins.
-rw-r--r-- | arch/arm/boot/dts/vf610-colibri.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf610-twr.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/vf610.dtsi | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi index 0cd83434b073..afe7cdca2026 100644 --- a/arch/arm/boot/dts/vf610-colibri.dtsi +++ b/arch/arm/boot/dts/vf610-colibri.dtsi @@ -31,6 +31,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; bus-width = <4>; + cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; }; &fec1 { @@ -71,6 +72,13 @@ &iomuxc { vf610-colibri { + pinctrl_gpio: gpios { + fsl,pins = < + VF610_PAD_PTD9__GPIO_88 0x219d + VF610_PAD_PTD10__GPIO_89 0x219d + >; + }; + 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 189b6975fe7d..3fe8a8ffe114 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts @@ -116,6 +116,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/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi index 4d2ec32de96f..467c97e655a8 100644 --- a/arch/arm/boot/dts/vf610.dtsi +++ b/arch/arm/boot/dts/vf610.dtsi @@ -11,6 +11,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 { |