vserver 2.0 rc7

[linux-2.6.git] / arch / arm / mach-omap / leds.c

diff --git a/arch/arm/mach-omap/leds.c b/arch/arm/mach-omap/leds.c
index b6d0c72..8ab21fe 100644 (file)
--- a/arch/arm/mach-omap/leds.c
+++ b/arch/arm/mach-omap/leds.c
@@ -9,6 +9,9 @@
 #include <asm/leds.h>
 #include <asm/mach-types.h>
 
+#include <asm/arch/gpio.h>
+#include <asm/arch/mux.h>
+
 #include "leds.h"
 
 static int __init
@@ -17,8 +20,38 @@ omap_leds_init(void)
        if (machine_is_omap_innovator())
                leds_event = innovator_leds_event;
 
-       else if (machine_is_omap_h2() || machine_is_omap_perseus2()) {
+       else if (machine_is_omap_h2() || machine_is_omap_perseus2())
                leds_event = h2p2_dbg_leds_event;
+
+       else if (machine_is_omap_osk())
+               leds_event = osk_leds_event;
+
+       else
+               return -1;
+
+       if (machine_is_omap_h2()
+                       || machine_is_omap_perseus2()
+                       || machine_is_omap_osk()) {
+
+               /* LED1/LED2 pins can be used as GPIO (as done here), or by
+                * the LPG (works even in deep sleep!), to drive a bicolor
+                * LED on the H2 sample board, and another on the H2/P2
+                * "surfer" expansion board.
+                *
+                * The same pins drive a LED on the OSK Mistral board, but
+                * that's a different kind of LED (just one color at a time).
+                */
+               omap_cfg_reg(P18_1610_GPIO3);
+               if (omap_request_gpio(3) == 0)
+                       omap_set_gpio_direction(3, 0);
+               else
+                       printk(KERN_WARNING "LED: can't get GPIO3/red?\n");
+
+               omap_cfg_reg(MPUIO4);
+               if (omap_request_gpio(OMAP_MPUIO(4)) == 0)
+                       omap_set_gpio_direction(OMAP_MPUIO(4), 0);
+               else
+                       printk(KERN_WARNING "LED: can't get MPUIO4/green?\n");
        }
 
        leds_event(led_start);