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/Kconfig | |
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/Kconfig')
-rw-r--r-- | arch/arm/mach-omap1/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 7408ac94f771..27fc2e8e5fca 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
@@ -47,6 +47,14 @@ config MACH_OMAP_OSK | |||
47 | TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here | 47 | TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here |
48 | if you have such a board. | 48 | if you have such a board. |
49 | 49 | ||
50 | config OMAP_OSK_MISTRAL | ||
51 | bool "Mistral QVGA board Support" | ||
52 | depends on MACH_OMAP_OSK | ||
53 | help | ||
54 | The OSK supports an optional add-on board with a Quarter-VGA | ||
55 | touchscreen, PDA-ish buttons, a resume button, bicolor LED, | ||
56 | and camera connector. Say Y here if you have this board. | ||
57 | |||
50 | config MACH_OMAP_PERSEUS2 | 58 | config MACH_OMAP_PERSEUS2 |
51 | bool "TI Perseus2" | 59 | bool "TI Perseus2" |
52 | depends on ARCH_OMAP1 && ARCH_OMAP730 | 60 | depends on ARCH_OMAP1 && ARCH_OMAP730 |