[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>
This commit is contained in:
committed by
Russell King
parent
d7b6b35894
commit
7c38cf021b
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-omap/leds.c
|
||||
* linux/arch/arm/mach-omap1/leds.c
|
||||
*
|
||||
* OMAP LEDs dispatcher
|
||||
*/
|
||||
@@ -20,7 +20,9 @@ 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_h3()
|
||||
|| machine_is_omap_perseus2())
|
||||
leds_event = h2p2_dbg_leds_event;
|
||||
|
||||
else if (machine_is_omap_osk())
|
||||
@@ -30,8 +32,12 @@ omap_leds_init(void)
|
||||
return -1;
|
||||
|
||||
if (machine_is_omap_h2()
|
||||
|| machine_is_omap_h3()
|
||||
|| machine_is_omap_perseus2()
|
||||
|| machine_is_omap_osk()) {
|
||||
#ifdef CONFIG_OMAP_OSK_MISTRAL
|
||||
|| machine_is_omap_osk()
|
||||
#endif
|
||||
) {
|
||||
|
||||
/* LED1/LED2 pins can be used as GPIO (as done here), or by
|
||||
* the LPG (works even in deep sleep!), to drive a bicolor
|
||||
|
Reference in New Issue
Block a user