| Message ID | 00b4375542ac3698ed59d3ea353cc14e1c00a5bc.1410020459.git.stefan@agner.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Sep 6, 2014 at 6:25 PM, Stefan Agner <stefan@agner.ch> wrote: > Use GPIO support by adding SD card detection configuration and > GPIO pinmux for Colibri's standard GPIO pins. > > Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Linus Walleij <linus.walleij@linaro.org> I guess you need the rest to be merged first though? Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi index 0cd8343..afe7cdc 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 189b697..3fe8a8f 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 4d2ec32..467c97e 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 {
Use GPIO support by adding SD card detection configuration and GPIO pinmux for Colibri's standard GPIO pins. Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/boot/dts/vf610-colibri.dtsi | 8 ++++++++ arch/arm/boot/dts/vf610-twr.dts | 1 + arch/arm/boot/dts/vf610.dtsi | 1 + 3 files changed, 10 insertions(+)