diff options
author | David Brownell <david-b@pacbell.net> | 2007-04-02 15:48:10 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-08-22 03:42:51 -0400 |
commit | eebdf7d7c478682756fd29d376223f350311f105 (patch) | |
tree | 2781d1bf7db9a45c350dc43394f791153db3adff /arch/arm/Kconfig | |
parent | 4e63915cbe4525beb9c0281f8e22945d88acc9bc (diff) |
ARM: OMAP: OSK led fixes
Bugfixes for the OSK led support:
- Fix Kconfig merge glitches: Mistral handles idle and timer leds just fine
- Fix pm_suspend() runtime botch: can't sleep, so can't touch tps65010 leds
Improvements:
- Switch sense of Mistral idle led, so idle == off
Probably the TPS65010 leds should be handled only by the "new led" API.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d6145298a325..691aae309c8a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -721,7 +721,8 @@ config LEDS | |||
721 | 721 | ||
722 | config LEDS_TIMER | 722 | config LEDS_TIMER |
723 | bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ | 723 | bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ |
724 | MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 | 724 | OMAP_OSK_MISTRAL || MACH_OMAP_H2 \ |
725 | || MACH_OMAP_PERSEUS2 | ||
725 | depends on LEDS | 726 | depends on LEDS |
726 | depends on !GENERIC_CLOCKEVENTS | 727 | depends on !GENERIC_CLOCKEVENTS |
727 | default y if ARCH_EBSA110 | 728 | default y if ARCH_EBSA110 |
@@ -738,7 +739,9 @@ config LEDS_TIMER | |||
738 | 739 | ||
739 | config LEDS_CPU | 740 | config LEDS_CPU |
740 | bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ | 741 | bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ |
741 | !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 | 742 | !ARCH_OMAP) \ |
743 | || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \ | ||
744 | || MACH_OMAP_PERSEUS2 | ||
742 | depends on LEDS | 745 | depends on LEDS |
743 | help | 746 | help |
744 | If you say Y here, the red LED will be used to give a good real | 747 | If you say Y here, the red LED will be used to give a good real |