diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2011-03-17 19:04:57 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-22 00:29:43 +0100 |
| commit | 9edb240696bacd53f4331119d2dfd13d4cd4852f (patch) | |
| tree | d10810d41145b26cbe1b46954acde96efb82e460 /arch/arm | |
| parent | ARM: S3C2442: RX1950: Add support for LED blinking (diff) | |
| download | linux-9edb240696bacd53f4331119d2dfd13d4cd4852f.tar.xz linux-9edb240696bacd53f4331119d2dfd13d4cd4852f.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-rx1950.c | 23 |
2 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 882b32af9dde..2a2fa0620133 100644 --- 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 22f18d9e2d79..27ea95096fe1 100644 --- 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, }, }; |