Minor cosmetic clean-up for LDP for mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0d9f4960d4e8db33b2a8820c15cff5881a2b3d8a..b03e2533b1696e5f7a7d8b310d38db8169b8bca2 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -5,10 +5,6 @@ config ARCH_OMAP24XX
        bool "OMAP24xx Based System"
        depends on ARCH_OMAP2
 
-config ARCH_OMAP34XX
-       bool "OMAP34xx Based System"
-       depends on ARCH_OMAP3
-
 config ARCH_OMAP2420
        bool "OMAP2420 support"
        depends on ARCH_OMAP24XX
@@ -18,10 +14,16 @@ config ARCH_OMAP2420
 config ARCH_OMAP2430
        bool "OMAP2430 support"
        depends on ARCH_OMAP24XX
+       select ARCH_OMAP_OTG
+
+config ARCH_OMAP34XX
+       bool "OMAP34xx Based System"
+       depends on ARCH_OMAP3
 
 config ARCH_OMAP3430
        bool "OMAP3430 support"
        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+       select ARCH_OMAP_OTG
 
 comment "OMAP Board Type"
        depends on ARCH_OMAP2 || ARCH_OMAP3
@@ -32,11 +34,21 @@ config MACH_OMAP_GENERIC
 
 config MACH_NOKIA_N800
        bool "Nokia N800"
-       depends on ARCH_OMAP24XX
-       select VIDEO_TCM825X if VIDEO_OMAP2
+       depends on ARCH_OMAP2420
+       select VIDEO_TCM825X if VIDEO_OMAP2 && VIDEO_HELPER_CHIPS_AUTO
        select CBUS if VIDEO_TCM825X
        select CBUS_RETU if VIDEO_TCM825X
        select MENELAUS if VIDEO_TCM825X
+       select OMAP_GPIO_SWITCH
+
+config MACH_NOKIA_N810
+       bool "Nokia N810"
+       depends on MACH_NOKIA_N800
+
+config MACH_NOKIA_N810_WIMAX
+       bool "Nokia N810 WiMAX"
+       depends on MACH_NOKIA_N800
+       select MACH_NOKIA_N810
 
 config MACH_OMAP2_TUSB6010
        bool
@@ -45,14 +57,10 @@ config MACH_OMAP2_TUSB6010
 
 config MACH_OMAP_H4
        bool "OMAP 2420 H4 board"
-       depends on ARCH_OMAP2 && ARCH_OMAP24XX
+       depends on ARCH_OMAP2 && ARCH_OMAP2420
        select OMAP_DEBUG_DEVICES
        select GPIOEXPANDER_OMAP
 
-
-config MACH_OMAP_3430SDP
-       bool "OMAP 3430 SDP board"
-       depends on ARCH_OMAP3 && ARCH_OMAP34XX
 config MACH_OMAP_H4_TUSB
        bool "TUSB 6010 EVM board"
        depends on MACH_OMAP_H4
@@ -89,18 +97,48 @@ config MACH_OMAP2_H4_USB1
 
 config MACH_OMAP_APOLLON
        bool "OMAP 2420 Apollon board"
-       depends on ARCH_OMAP2 && ARCH_OMAP24XX
-
-config MACH_OMAP_APOLLON_PLUS
-       bool "OMAP 2420 Apollon Plus board"
-       select MACH_OMAP_APOLLON
-       help
-         It contains more LEDs, SWs, and so on
-
-         Note that it is only tested with version 1.1 and more
-         We have to test the version 1.0
+       depends on ARCH_OMAP2 && ARCH_OMAP2420
 
 config MACH_OMAP_2430SDP
        bool "OMAP 2430 SDP board"
+       depends on ARCH_OMAP2 && ARCH_OMAP2430
+
+config MACH_OMAP_LDP
+       bool "OMAP3 LDP board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OMAP2EVM 
+       bool "OMAP 2530 EVM board"
        depends on ARCH_OMAP2 && ARCH_OMAP24XX
 
+config MACH_OMAP_3430SDP
+       bool "OMAP 3430 SDP board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OMAP3EVM
+       bool "OMAP 3530 EVM board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OMAP3_BEAGLE
+       bool "OMAP3 BEAGLE board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OVERO
+       bool "Gumstix Overo board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config OMAP_TICK_GPTIMER
+       int "GPTIMER used for system tick timer"
+       depends on ARCH_OMAP2 || ARCH_OMAP3
+       range 1 12
+       default 1
+       help
+         Linux uses one of the twelve on-board OMAP GPTIMER blocks to generate
+         system tick interrupts.  The twelve GPTIMERs have slightly
+         different powerdomain, source clock, and security properties
+         (mostly documented in the OMAP3 TRMs) that can affect the selection
+         of which GPTIMER to use.  The historical default is GPTIMER1.
+         If CONFIG_OMAP_32K_TIMER is selected, Beagle may require GPTIMER12
+         due to hardware sensitivity to glitches on the OMAP 32kHz clock
+         input.
+