OMAP: move GP timer selection alongside other timer options

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index ca24a7a37c3c2725b40511568592dc79ccb8f98f..0a86a88d52852349cb6a7ef02f267428eede3b4f 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -132,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.
-

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 2465aea097a63836ad8678dcea32483f6a135787..6c9f09257db40b50ff14777a633894356724caf2 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -214,6 +214,21 @@ config OMAP_32K_TIMER_HZ
          Kernel internal timer frequency should be a divisor of 32768,
          such as 64 or 128.
 
+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.
+
 config OMAP_DM_TIMER
        bool "Use dual-mode timer"
        depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX