OMAP: move GP timer selection alongside other timer options

[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 fd62c7ebf0b25910c49eee9b62d3bf742449d35f..0a86a88d52852349cb6a7ef02f267428eede3b4f 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -10,11 +10,13 @@ config ARCH_OMAP2420
        depends on ARCH_OMAP24XX
        select OMAP_DM_TIMER
        select ARCH_OMAP_OTG
+       select CPU_V6
 
 config ARCH_OMAP2430
        bool "OMAP2430 support"
        depends on ARCH_OMAP24XX
        select ARCH_OMAP_OTG
+       select CPU_V6
 
 config ARCH_OMAP34XX
        bool "OMAP34xx Based System"
@@ -24,6 +26,7 @@ config ARCH_OMAP3430
        bool "OMAP3430 support"
        depends on ARCH_OMAP3 && ARCH_OMAP34XX
        select ARCH_OMAP_OTG
+       select CPU_V7
 
 comment "OMAP Board Type"
        depends on ARCH_OMAP2 || ARCH_OMAP3
@@ -59,7 +62,6 @@ config MACH_OMAP_H4
        bool "OMAP 2420 H4 board"
        depends on ARCH_OMAP2 && ARCH_OMAP2420
        select OMAP_DEBUG_DEVICES
-       select GPIOEXPANDER_OMAP
 
 config MACH_OMAP_H4_TUSB
        bool "TUSB 6010 EVM board"
@@ -130,19 +132,3 @@ config MACH_OVERO
 config MACH_OMAP3_PANDORA
        bool "OMAP3 Pandora"
        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.
-