]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Fri, 14 Dec 2012 17:17:08 +0000 (18:17 +0100)
committerTony Lindgren <tony@atomide.com>
Fri, 1 Feb 2013 22:59:34 +0000 (14:59 -0800)
The IGEPv2 board has two user GPIO LEDs and one of them is
default to "on" to tell the user that the board booted correctly.

But to use these LEDs the config options CONFIG_LEDS_GPIO,
CONFIG_LEDS_TRIGGERS and CONFIG_LEDS_TRIGGER_DEFAULT_ON have to
be enabled.

Since only the default-on and default-off triggers were used
anyway, it is better to just use .default_state instead of
.default_trigger and not depend on CONFIG_LEDS_TRIGGER_*

Also, this is consistent with IGEPv2 Device Tree that uses
default-state instead of linux,default-trigger for the leds
device nodes. The LED names also have been updated to use the
same names used on omap3-igep0020.dtb.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-igep0020.c

index 0f24cb84ba5a524ff0256462d84be6cc2d6d9b0e..1921541a72771f651c27ebef255956acfee67371 100644 (file)
@@ -300,20 +300,20 @@ static struct omap2_hsmmc_info mmc[] = {
 
 static struct gpio_led igep_gpio_leds[] = {
        [0] = {
-               .name                   = "gpio-led:red:d0",
-               .default_trigger        = "default-off"
+               .name                   = "omap3:red:user0",
+               .default_state          = 0,
        },
        [1] = {
-               .name                   = "gpio-led:green:d0",
-               .default_trigger        = "default-off",
+               .name                   = "omap3:green:boot",
+               .default_state          = 1,
        },
        [2] = {
-               .name                   = "gpio-led:red:d1",
-               .default_trigger        = "default-off",
+               .name                   = "omap3:red:user1",
+               .default_state          = 0,
        },
        [3] = {
-               .name                   = "gpio-led:green:d1",
-               .default_trigger        = "heartbeat",
+               .name                   = "omap3:green:user1",
+               .default_state          = 0,
                .gpio                   = -EINVAL, /* gets replaced */
                .active_low             = 1,
        },