ARM: H1940/RX1950: Change default LED triggers

Change LED triggers to mimic WinMobile behavior:
red blinking when battery is charging,
orange solid when battery is charged.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 882b32af9ddef947b05547eb0936b9beb8eb3e58..2a2fa0620133cdee7086e44034764e703bfefd2a 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -418,13 +418,14 @@ EXPORT_SYMBOL(h1940_led_blink_set);
 static struct gpio_led h1940_leds_desc[] = {
        {
                .name                   = "Green",
-               .default_trigger        = "main-battery-charging-or-full",
+               .default_trigger        = "main-battery-full",
                .gpio                   = H1940_LATCH_LED_GREEN,
                .retain_state_suspended = 1,
        },
        {
                .name                   = "Red",
-               .default_trigger        = "main-battery-full",
+               .default_trigger
+                       = "main-battery-charging-blink-full-solid",
                .gpio                   = H1940_LATCH_LED_RED,
                .retain_state_suspended = 1,
        },

diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index 22f18d9e2d79d4065f94a95526a278277cdf195d..27ea95096fe19a33187af0e9a34e7ca58c071ea6 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/arch/arm/mach-s3c2440/mach-rx1950.c
@@ -311,22 +311,23 @@ static int rx1950_led_blink_set(unsigned gpio, int state,
 
 static struct gpio_led rx1950_leds_desc[] = {
        {
-               .name                           = "Green",
-               .default_trigger        = "main-battery-charging-or-full",
-               .gpio                           = S3C2410_GPA(6),
-               .retain_state_suspended         = 1,
+               .name                   = "Green",
+               .default_trigger        = "main-battery-full",
+               .gpio                   = S3C2410_GPA(6),
+               .retain_state_suspended = 1,
        },
        {
-               .name                           = "Red",
-               .default_trigger        = "main-battery-full",
-               .gpio                           = S3C2410_GPA(7),
-               .retain_state_suspended         = 1,
+               .name                   = "Red",
+               .default_trigger
+                       = "main-battery-charging-blink-full-solid",
+               .gpio                   = S3C2410_GPA(7),
+               .retain_state_suspended = 1,
        },
        {
-               .name                           = "Blue",
+               .name                   = "Blue",
                .default_trigger        = "rx1950-acx-mem",
-               .gpio                           = S3C2410_GPA(11),
-               .retain_state_suspended         = 1,
+               .gpio                   = S3C2410_GPA(11),
+               .retain_state_suspended = 1,
        },
 };