lkml.org 
[lkml]   [2007]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 88/90] ARM: OMAP: OSK led fixes
    Date
    From: David Brownell <david-b@pacbell.net>

    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>
    ---
    arch/arm/Kconfig | 7 +++++--
    arch/arm/mach-omap1/leds-osk.c | 6 +++---
    arch/arm/mach-omap1/pm.c | 11 -----------
    3 files changed, 8 insertions(+), 16 deletions(-)

    diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
    index b995945..ddaa5b3 100644
    --- a/arch/arm/Kconfig
    +++ b/arch/arm/Kconfig
    @@ -668,7 +668,8 @@ config LEDS

    config LEDS_TIMER
    bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
    - MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
    + OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
    + || MACH_OMAP_PERSEUS2
    depends on LEDS
    default y if ARCH_EBSA110
    help
    @@ -684,7 +685,9 @@ config LEDS_TIMER

    config LEDS_CPU
    bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
    - !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
    + !ARCH_OMAP) \
    + || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
    + || MACH_OMAP_PERSEUS2
    depends on LEDS
    help
    If you say Y here, the red LED will be used to give a good real
    diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
    index 0cbf1b0..86de303 100644
    --- a/arch/arm/mach-omap1/leds-osk.c
    +++ b/arch/arm/mach-omap1/leds-osk.c
    @@ -133,13 +133,13 @@ void osk_leds_event(led_event_t evt)
    mistral_setled();
    break;

    - case led_idle_start:
    - hw_led_state |= IDLE_LED;
    + case led_idle_start: /* idle == off */
    + hw_led_state &= ~IDLE_LED;
    mistral_setled();
    break;

    case led_idle_end:
    - hw_led_state &= ~IDLE_LED;
    + hw_led_state |= IDLE_LED;
    mistral_setled();
    break;

    diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
    index 743029a..64c93ac 100644
    --- a/arch/arm/mach-omap1/pm.c
    +++ b/arch/arm/mach-omap1/pm.c
    @@ -58,7 +58,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>
    @@ -248,11 +247,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);

    @@ -445,11 +439,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)
    --
    1.4.4.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-04 20:21    [W:4.045 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site