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>

1 files changed, 0 insertions, 11 deletions

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 5bb348e2e315..2e68be607295 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -57,7 +57,6 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/tps65010.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/dsp_common.h>
 #include <asm/arch/dmtimer.h>
@@ -250,11 +249,6 @@ void omap_pm_suspend(void)
 
         omap_serial_wake_trigger(1);
 
-        if (machine_is_omap_osk()) {
-                /* Stop LED1 (D9) blink */
-                tps65010_set_led(LED1, OFF);
-        }
-
         if (!cpu_is_omap15xx())
                 omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
 
@@ -447,11 +441,6 @@ void omap_pm_suspend(void)
         omap_serial_wake_trigger(0);
 
         printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);
-
-        if (machine_is_omap_osk()) {
-                /* Let LED1 (D9) blink again */
-                tps65010_set_led(LED1, BLINK);
-        }
 }
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)