| Message ID | 1370011682-20675-1-git-send-email-dmurphy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 31, 2013 at 4:48 PM, Dan Murphy <dmurphy@ti.com> wrote: > The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es > are different. > > A1-A3 = gpio_wk7 > 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 <dmurphy@ti.com> > --- > v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/ > 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 d5d144a..523a800 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 GPIO_ACTIVE_HIGH>; > @@ -157,6 +162,15 @@ > }; > }; > > +&omap4_pmx_wkup { > + led_wkgpio_pins: pinmux_leds_wkpins { > + pinctrl-single,pins = < > + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 OUTPUT | MODE 3 */ > + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 OUTPUT | MODE 3 */ Hello Dan, The OUTPUT | MODE 3 in the comments were added so people shouldn't have to look at the TRM to find what each constant number meant. But now using the macros this is not needed anymore, so I don't think is necessary to keep that on the comments. Best regards, Javier -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/31/2013 10:05 AM, Javier Martinez Canillas wrote: > On Fri, May 31, 2013 at 4:48 PM, Dan Murphy <dmurphy@ti.com> wrote: >> The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es >> are different. >> >> A1-A3 = gpio_wk7 >> 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 <dmurphy@ti.com> >> --- >> v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/ >> 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 d5d144a..523a800 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 GPIO_ACTIVE_HIGH>; >> @@ -157,6 +162,15 @@ >> }; >> }; >> >> +&omap4_pmx_wkup { >> + led_wkgpio_pins: pinmux_leds_wkpins { >> + pinctrl-single,pins = < >> + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 OUTPUT | MODE 3 */ >> + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 OUTPUT | MODE 3 */ > Hello Dan, > > The OUTPUT | MODE 3 in the comments were added so people shouldn't > have to look at the TRM to find what each constant number meant. But > now using the macros this is not needed anymore, so I don't think is > necessary to keep that on the comments. > > Best regards, > Javier Yes you are correct sending update to remove the comments
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index d5d144a..523a800 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 GPIO_ACTIVE_HIGH>; @@ -157,6 +162,15 @@ }; }; +&omap4_pmx_wkup { + led_wkgpio_pins: pinmux_leds_wkpins { + pinctrl-single,pins = < + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 OUTPUT | MODE 3 */ + 0x1c (PIN_OUTPUT | MUX_MODE3) /* 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 5cfdf19..5551ec6 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -34,3 +34,31 @@ 0x5e (PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */ >; }; + +&omap4_pmx_core { + led_gpio_pins: gpio_led_pmx { + pinctrl-single,pins = < + 0xb6 (PIN_OUTPUT | MUX_MODE3) /* gpio_110 OUTPUT | MODE 3 */ + >; + }; +}; + +&led_wkgpio_pins { + pinctrl-single,pins = < + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 OUTPUT | MODE 3 */ + >; +}; + +&leds { + pinctrl-0 = < + &led_gpio_pins + &led_wkgpio_pins + >; + + heartbeat { + gpios = <&gpio4 14 0>; + }; + mmc { + gpios = <&gpio1 8 0>; + }; +};
The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es are different. A1-A3 = gpio_wk7 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 <dmurphy@ti.com> --- v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/ 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(-)