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 80/90] ARM: OMAP: partial LED fixes
    Date
    From: David Brownell <david-b@pacbell.net>

    Partial fix for CONFIG_LEDS breakage ... at least allow platforms
    using the debug-leds support (H4 for now) to build with the generic
    LED support, and default the LED that would be the timer LED to
    trigger using the "heartbeat" (timer driven, rate depends on load).

    Right now only H2 and P2 seem to have working LED support; this
    at least makes H4 less broken.

    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    ---
    arch/arm/plat-omap/debug-leds.c | 17 ++++++-----------
    1 files changed, 6 insertions(+), 11 deletions(-)

    diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
    index 511d6a5..9128a80 100644
    --- a/arch/arm/plat-omap/debug-leds.c
    +++ b/arch/arm/plat-omap/debug-leds.c
    @@ -39,12 +39,6 @@ static struct h2p2_dbg_fpga __iomem *fpga;
    static u16 led_state, hw_led_state;


    -#ifdef CONFIG_LEDS
    -#define old_led_api() 1
    -#else
    -#define old_led_api() 0
    -#endif
    -
    #ifdef CONFIG_LEDS_OMAP_DEBUG
    #define new_led_api() 1
    #else
    @@ -202,7 +196,8 @@ struct dbg_led {
    static struct dbg_led dbg_leds[] = {
    /* REVISIT at least H2 uses different timer & cpu leds... */
    #ifndef CONFIG_LEDS_TIMER
    - { .mask = 1 << 0, .cdev.name = "d4:green", }, /* timer */
    + { .mask = 1 << 0, .cdev.name = "d4:green",
    + .cdev.default_trigger = "heartbeat", },
    #endif
    #ifndef CONFIG_LEDS_CPU
    { .mask = 1 << 1, .cdev.name = "d5:green", }, /* !idle */
    @@ -274,10 +269,10 @@ static int /* __init */ fpga_probe(struct platform_device *pdev)
    fpga = ioremap(iomem->start, H2P2_DBG_FPGA_SIZE);
    __raw_writew(~0, &fpga->leds);

    - if (old_led_api()) {
    - leds_event = h2p2_dbg_leds_event;
    - leds_event(led_start);
    - }
    +#ifdef CONFIG_LEDS
    + leds_event = h2p2_dbg_leds_event;
    + leds_event(led_start);
    +#endif

    if (new_led_api()) {
    newled_init(&pdev->dev);
    --
    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:53    [W:4.026 / U:0.708 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site