Fix omap4 panda LED definitions
PATCH 1/1 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.
PATCH 1/1 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.
--- arch/arm/boot/dts/omap4-panda-es.dts | 33 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4-panda.dts | 22 +++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap4-panda-es.dts +33 -0
@@ -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 */ + >; + }; +};
arch/arm/boot/dts/omap4-panda.dts +21 -1
@@ -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 {
Signature · 1 line
1.7.9.5
Re: [PATCH] ARM: dts: omap4-panda: Add LED support into the panda DTS files
Quoted 4 lines · Dan Murphy
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
Re: [PATCH] ARM: dts: omap4-panda: Add LED support into the panda DTS files
Quoted 9 lines · Jon Hunter
Quoted 4 lines · Dan Murphy
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 aomap4-panda-common.dtsiwhere the led stuff currently resides.
Quoted 5 lines
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
Signature · 2 lines
---------------------------------------------- Dan Murphy