* Vincent Stehlé <v-stehle@xxxxxx> [130405 10:08]: > Add pinmux configuration for the OMAP4 PandaBoard & ES status leds. We need to > introduce an empty leds_core_pins section in the "shared" omap4-panda.dts for > this, which is only used in the -es case. > > While at it, fix the heartbeat led for PandaBoard ES, which is gpio_110. > > Signed-off-by: Vincent Stehlé <v-stehle@xxxxxx> > Reported-by: Gemini Tran <gemini.tran@xxxxxx> > --- > > Hi, > > Here is a patch to repair the OMAP4 PandaBoard status leds muxing. Could you > please give me your feedback on this? Added Benoit to cc also. > This is tested on PandaBoard ES only for the moment; so I would appreciate any > test report on PandaBoard Ax! > > Note: the empty leds_core_pins / pinmux_leds_core_pins section does not seem to > be a problem, but maybe there is a more elegant way? How about move the common entries to omap4-panda-common.dtsi that Benoit has queued up as "ARM: dts: omap4-panda: move generic sections to panda-common"? That way you can define the muxes in the board specifc .dts files without having to add the empty entries. Regards, Tony > arch/arm/boot/dts/omap4-panda-es.dts | 21 ++++++++++++++++++++- > arch/arm/boot/dts/omap4-panda.dts | 22 ++++++++++++++++++++-- > 2 files changed, 40 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts > index 73bc1a6..c1d6c0b 100644 > --- a/arch/arm/boot/dts/omap4-panda-es.dts > +++ b/arch/arm/boot/dts/omap4-panda-es.dts > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ > + * Copyright (C) 2012-2013 Texas Instruments Incorporated - http://www.ti.com/ > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License version 2 as > @@ -31,3 +31,22 @@ > 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ > >; > }; > + > +/* PandaboardES has "half" different status leds gpios compared to PandaBoard4430. */ > +&heartbeat { > + label = "pandaboard::status1"; > + gpios = <&gpio4 14 0>; /* gpio_110 */ > + linux,default-trigger = "heartbeat"; > +}; > + > +&leds_core_pins { > + pinctrl-single,pins = < > + 0xb6 0x3 /* abe_mcbsp2_clkx.gpio_110 OUTPUT | MODE3 */ > + >; > +}; > + > +&leds_wkup_pins { > + pinctrl-single,pins = < > + 0x1c 0x3 /* fref_clk4_out.gpio_wk8 OUTPUT | MODE3 */ > + >; > +}; > diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts > index 4122efe..e645c4e 100644 > --- a/arch/arm/boot/dts/omap4-panda.dts > +++ b/arch/arm/boot/dts/omap4-panda.dts > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ > + * Copyright (C) 2011-2013 Texas Instruments Incorporated - http://www.ti.com/ > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License version 2 as > @@ -21,7 +21,7 @@ > > leds { > compatible = "gpio-leds"; > - heartbeat { > + heartbeat: heartbeat { > label = "pandaboard::status1"; > gpios = <&gpio1 7 0>; > linux,default-trigger = "heartbeat"; > @@ -67,6 +67,7 @@ > &mcbsp1_pins > &dss_hdmi_pins > &tpd12s015_pins > + &leds_core_pins > >; > > twl6040_pins: pinmux_twl6040_pins { > @@ -110,6 +111,23 @@ > 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ > >; > }; > + > + leds_core_pins: pinmux_leds_core_pins { > + }; > +}; > + > +&omap4_pmx_wkup { > + pinctrl-names = "default"; > + pinctrl-0 = < > + &leds_wkup_pins > + >; > + > + leds_wkup_pins: pinmux_leds_wkup_pins { > + pinctrl-single,pins = < > + 0x1a 0x3 /* fref_clk4_req.gpio_wk7 OUTPUT | MODE3 */ > + 0x1c 0x3 /* fref_clk4_out.gpio_wk8 OUTPUT | MODE3 */ > + >; > + }; > }; > > &i2c1 { > -- > 1.8.1.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
