Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e0b50d3c644f10a0022b23fccb58c8003741db52
Commit:     e0b50d3c644f10a0022b23fccb58c8003741db52
Parent:     b1465bf7098fa761962f09a6bb2c0e831af85e63
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 28 13:09:36 2007 -0700
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Wed May 9 10:39:42 2007 +0100

    ARM: OMAP: partial LED fixes
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to