diff options
author | Vasily Khoruzhick <anarsoul@gmail.com> | 2011-03-17 14:04:57 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-21 19:29:43 -0400 |
commit | 9edb240696bacd53f4331119d2dfd13d4cd4852f (patch) | |
tree | d10810d41145b26cbe1b46954acde96efb82e460 /arch | |
parent | 62235dcd2ad4f46ea9e5d4f71c5ea3111341c6e8 (diff) |
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')
-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); | |||
418 | static struct gpio_led h1940_leds_desc[] = { | 418 | static struct gpio_led h1940_leds_desc[] = { |
419 | { | 419 | { |
420 | .name = "Green", | 420 | .name = "Green", |
421 | .default_trigger = "main-battery-charging-or-full", | 421 | .default_trigger = "main-battery-full", |
422 | .gpio = H1940_LATCH_LED_GREEN, | 422 | .gpio = H1940_LATCH_LED_GREEN, |
423 | .retain_state_suspended = 1, | 423 | .retain_state_suspended = 1, |
424 | }, | 424 | }, |
425 | { | 425 | { |
426 | .name = "Red", | 426 | .name = "Red", |
427 | .default_trigger = "main-battery-full", | 427 | .default_trigger |
428 | = "main-battery-charging-blink-full-solid", | ||
428 | .gpio = H1940_LATCH_LED_RED, | 429 | .gpio = H1940_LATCH_LED_RED, |
429 | .retain_state_suspended = 1, | 430 | .retain_state_suspended = 1, |
430 | }, | 431 | }, |
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, | |||
311 | 311 | ||
312 | static struct gpio_led rx1950_leds_desc[] = { | 312 | static struct gpio_led rx1950_leds_desc[] = { |
313 | { | 313 | { |
314 | .name = "Green", | 314 | .name = "Green", |
315 | .default_trigger = "main-battery-charging-or-full", | 315 | .default_trigger = "main-battery-full", |
316 | .gpio = S3C2410_GPA(6), | 316 | .gpio = S3C2410_GPA(6), |
317 | .retain_state_suspended = 1, | 317 | .retain_state_suspended = 1, |
318 | }, | 318 | }, |
319 | { | 319 | { |
320 | .name = "Red", | 320 | .name = "Red", |
321 | .default_trigger = "main-battery-full", | 321 | .default_trigger |
322 | .gpio = S3C2410_GPA(7), | 322 | = "main-battery-charging-blink-full-solid", |
323 | .retain_state_suspended = 1, | 323 | .gpio = S3C2410_GPA(7), |
324 | .retain_state_suspended = 1, | ||
324 | }, | 325 | }, |
325 | { | 326 | { |
326 | .name = "Blue", | 327 | .name = "Blue", |
327 | .default_trigger = "rx1950-acx-mem", | 328 | .default_trigger = "rx1950-acx-mem", |
328 | .gpio = S3C2410_GPA(11), | 329 | .gpio = S3C2410_GPA(11), |
329 | .retain_state_suspended = 1, | 330 | .retain_state_suspended = 1, |
330 | }, | 331 | }, |
331 | }; | 332 | }; |
332 | 333 | ||