ARM: dts: omap4-panda: Update the LED support for the panda

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>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index d5d144a1a6c2062274c0e01c5c8093b8d1dce8dc..800fa4e992491c78ebae560234862c9a22427880 100644 (file)
--- 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 */
+                       0x1c (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk8 */
+               >;
+       };
+};
+
 &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 5cfdf194252fca941877fdeed00a52742c3459dc..56c435468e94a8399f21236b7b553eea15bcc697 100644 (file)
--- 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 */
+               >;
+       };
+};
+
+&led_wkgpio_pins {
+       pinctrl-single,pins = <
+               0x1c (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk8 */
+       >;
+};
+
+&leds {
+       pinctrl-0 = <
+               &led_gpio_pins
+               &led_wkgpio_pins
+       >;
+
+       heartbeat {
+               gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>;
+       };
+       mmc {
+               gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+       };
+};