Hi Dan, On 05/29/2013 01:20 PM, Dan Murphy wrote: > The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es > are different. > > A1-A3 = gpio_wk7clean > ES = gpio_110 > > There is no change to LED D2 > > Abstract away the pinmux and the LED definitions for the two boards into > the respective DTS files. > > Signed-off-by: Dan Murphy <dmur...@ti.com>
That patch was good... until Florian introduces some new constant to improve the readability of the DTS [1]. Could you rebase on the lastest for_3.11/dts and use the macros for the GPIO and pinctrl nodes? Thanks, Benoit [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg89684.html > --- > v7 - Update headline to add spaces - > https://patchwork.kernel.org/patch/2583661/ > v6 - Review comments updated - https://patchwork.kernel.org/patch/2582771/ > v5 - Provide pincrtl phandle to the gpio-led driver - > https://patchwork.kernel.org/patch/2573981/ > > arch/arm/boot/dts/omap4-panda-common.dtsi | 16 +++++++++++++++- > arch/arm/boot/dts/omap4-panda-es.dts | 28 ++++++++++++++++++++++++++++ > 2 files changed, 43 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi > b/arch/arm/boot/dts/omap4-panda-common.dtsi > index 03bd60d..5fd59b3 100644 > --- a/arch/arm/boot/dts/omap4-panda-common.dtsi > +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi > @@ -16,8 +16,13 @@ > reg = <0x80000000 0x40000000>; /* 1 GB */ > }; > > - leds { > + leds: leds { > compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = < > + &led_wkgpio_pins > + >; > + > heartbeat { > label = "pandaboard::status1"; > gpios = <&gpio1 7 0>; > @@ -137,6 +142,15 @@ > }; > }; > > +&omap4_pmx_wkup { > + led_wkgpio_pins: pinmux_leds_wkpins { > + pinctrl-single,pins = < > + 0x1a 0x3 /* gpio_wk7 OUTPUT | MODE 3 */ > + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ > + >; > + }; > +}; > + > &i2c1 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c1_pins>; > diff --git a/arch/arm/boot/dts/omap4-panda-es.dts > b/arch/arm/boot/dts/omap4-panda-es.dts > index f1d8c21..c968a3b 100644 > --- a/arch/arm/boot/dts/omap4-panda-es.dts > +++ b/arch/arm/boot/dts/omap4-panda-es.dts > @@ -34,3 +34,31 @@ > 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ > >; > }; > + > +&omap4_pmx_core { > + led_gpio_pins: gpio_led_pmx { > + pinctrl-single,pins = < > + 0xb6 0x3 /* gpio_110 OUTPUT | MODE 3 */ > + >; > + }; > +}; > + > +&led_wkgpio_pins { > + pinctrl-single,pins = < > + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ > + >; > +}; > + > +&leds { > + pinctrl-0 = < > + &led_gpio_pins > + &led_wkgpio_pins > + >; > + > + heartbeat { > + gpios = <&gpio4 14 0>; > + }; > + mmc { > + gpios = <&gpio1 8 0>; > + }; > +}; > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
