diff options
author | Tony Lindgren <tony@atomide.com> | 2005-09-08 18:07:38 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-08 18:07:38 -0400 |
commit | 7c38cf021b42a4297bc8f860ab627734bdd6c8d1 (patch) | |
tree | 89c3b807ca90f5c7e5692ddbcd388511dc289530 /arch/arm/mach-omap1/leds.c | |
parent | d7b6b3589471c3856f1e6dc9c77abc4af962ffdb (diff) |
[ARM] 2890/1: OMAP 1/4: Update omap1 specific files, take 2
Patch from Tony Lindgren
This patch syncs the mainline kernel with linux-omap tree.
The highlights of the patch are:
- Convert more drivers to register resources in board-*.c to take
advantage of the driver model by David Brownell and Ladislav Michl
- Use set_irq_type() for GPIO interrupts instead of
omap_set_gpio_edge_ctrl() by David Brownell
- Add minimal support for handling optional add-on boards, such as
OSK Mistral board with LCD and keypad, by David Brownell
- Minimal support for loading functions to SRAM by Tony Lindgren
- Wake up from serial port by muxing RX lines temporarily into GPIO
interrupts by Tony Lindgren
- 32KHz sched_clock by Tony Lindgren and Juha Yrjola
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/leds.c')
-rw-r--r-- | arch/arm/mach-omap1/leds.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c index 8ab21fe98e1b..5c6b1bb6e722 100644 --- a/arch/arm/mach-omap1/leds.c +++ b/arch/arm/mach-omap1/leds.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-omap/leds.c | 2 | * linux/arch/arm/mach-omap1/leds.c |
3 | * | 3 | * |
4 | * OMAP LEDs dispatcher | 4 | * OMAP LEDs dispatcher |
5 | */ | 5 | */ |
@@ -20,7 +20,9 @@ omap_leds_init(void) | |||
20 | if (machine_is_omap_innovator()) | 20 | if (machine_is_omap_innovator()) |
21 | leds_event = innovator_leds_event; | 21 | leds_event = innovator_leds_event; |
22 | 22 | ||
23 | else if (machine_is_omap_h2() || machine_is_omap_perseus2()) | 23 | else if (machine_is_omap_h2() |
24 | || machine_is_omap_h3() | ||
25 | || machine_is_omap_perseus2()) | ||
24 | leds_event = h2p2_dbg_leds_event; | 26 | leds_event = h2p2_dbg_leds_event; |
25 | 27 | ||
26 | else if (machine_is_omap_osk()) | 28 | else if (machine_is_omap_osk()) |
@@ -30,8 +32,12 @@ omap_leds_init(void) | |||
30 | return -1; | 32 | return -1; |
31 | 33 | ||
32 | if (machine_is_omap_h2() | 34 | if (machine_is_omap_h2() |
35 | || machine_is_omap_h3() | ||
33 | || machine_is_omap_perseus2() | 36 | || machine_is_omap_perseus2() |
34 | || machine_is_omap_osk()) { | 37 | #ifdef CONFIG_OMAP_OSK_MISTRAL |
38 | || machine_is_omap_osk() | ||
39 | #endif | ||
40 | ) { | ||
35 | 41 | ||
36 | /* LED1/LED2 pins can be used as GPIO (as done here), or by | 42 | /* LED1/LED2 pins can be used as GPIO (as done here), or by |
37 | * the LPG (works even in deep sleep!), to drive a bicolor | 43 | * the LPG (works even in deep sleep!), to drive a bicolor |