2013-04-17 19:09:52

by Dan Murphy

Subject: [PATCH] Fix omap4 panda LED definitions

The LED GPIOs between the 4430 (a1-a4) and 4460 (es) panda boards
are different. This patch abstracts the LED definitions into the
respective board files.

2013-04-17 19:09:59

by Dan Murphy

Subject: [PATCH] ARM: dts: omap4-panda: Add LED support into the panda DTS files

The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
are different.

Abstract away the pinmux and the LED definitions for the two boards.

Signed-off-by: Dan Murphy <[email protected]>
---
arch/arm/boot/dts/omap4-panda-es.dts | 33 +++++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap4-panda.dts | 22 +++++++++++++++++++++-
2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts
index 73bc1a6..42fdd86 100644
--- a/arch/arm/boot/dts/omap4-panda-es.dts
+++ b/arch/arm/boot/dts/omap4-panda-es.dts
@@ -31,3 +31,36 @@
0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
>;
};
+
+&leds {
+ compatible = "gpio-leds";
+ heartbeat {
+ label = "pandaboard::status1";
+ gpios = <&gpio4 14 0>;
+ linux,default-trigger = "heartbeat";
+ };
+ mmc {
+ label = "pandaboard::status2";
+ gpios = <&gpio1 8 0>;
+ linux,default-trigger = "gpio";
+ };
+};
+
+&led_gpio_pins {
+ pinctrl-single,pins = <
+ 0xb6 0x3 /* gpio_110 OUTPUT | MODE 3 */
+ >;
+};
+
+&omap4_pmx_wkup {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &led_wkgpio_pins
+ >;
+
+ led_wkgpio_pins: pinmux_leds_wkpins {
+ pinctrl-single,pins = <
+ 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */
+ >;
+ };
+};
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
index 4122efe..465c4b0b8 100644
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -19,7 +19,7 @@
reg = <0x80000000 0x40000000>; /* 1 GB */
};

- leds {
+ leds: leds{
compatible = "gpio-leds";
heartbeat {
label = "pandaboard::status1";
@@ -67,6 +67,7 @@
&mcbsp1_pins
&dss_hdmi_pins
&tpd12s015_pins
+ &led_gpio_pins
>;

twl6040_pins: pinmux_twl6040_pins {
@@ -110,6 +111,25 @@
0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */
>;
};
+
+ led_gpio_pins: pinmux_leds_pins {
+ pinctrl-single,pins = <
+ >;
+ };
+};
+
+&omap4_pmx_wkup {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &led_wkgpio_pins
+ >;
+
+ led_wkgpio_pins: pinmux_leds_wkpins {
+ pinctrl-single,pins = <
+ 0x1a 0x3 /* gpio_wk7 OUTPUT | MODE 3 */
+ 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */
+ >;
+ };
};

&i2c1 {
--
1.7.9.5

2013-04-17 19:19:05

by Jon Hunter

Subject: Re: [PATCH] ARM: dts: omap4-panda: Add LED support into the panda DTS files

On 04/17/2013 02:09 PM, Dan Murphy wrote:
> The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
> are different.
>
> Abstract away the pinmux and the LED definitions for the two boards.

Just a heads-up but you should base this upon Benoit's for_3.10 branch
[1] as there is now a omap4-panda-common.dtsi where the led stuff
currently resides.

Cheers
Jon

[1]
http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.10/dts

2013-04-17 19:47:08

by Dan Murphy

Subject: Re: [PATCH] ARM: dts: omap4-panda: Add LED support into the panda DTS files

On 04/17/2013 02:18 PM, Jon Hunter wrote:
> On 04/17/2013 02:09 PM, Dan Murphy wrote:
>> The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es
>> are different.
>>
>> Abstract away the pinmux and the LED definitions for the two boards.
> Just a heads-up but you should base this upon Benoit's for_3.10 branch
> [1] as there is now a omap4-panda-common.dtsi where the led stuff
> currently resides.
>
> Cheers
> Jon
>
> [1]
> http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.10/dts
Thanks Jon. Will resend against Benoit's tree.

Dan

--
----------------------------------------------
Dan Murphy