summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/Kconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-05-29 00:45:14 +0200
committerTony Lindgren <tony@atomide.com>2009-05-29 00:45:14 +0200
commitcd07ecc828486e5887113c7dc4d9f9022145811b (patch)
treef3950d6077a794d4500244b2f372c6912af15eec /arch/arm/plat-omap/Kconfig
parentMerge branch 'omap3-boards' into for-next (diff)
parentARM: OMAP4: Add defconfig for 4430 SDP (diff)
downloadlinux-cd07ecc828486e5887113c7dc4d9f9022145811b.tar.xz
linux-cd07ecc828486e5887113c7dc4d9f9022145811b.zip
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
-rw-r--r--arch/arm/plat-omap/Kconfig11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 4bc9ed701dc4..f8a61249f7d9 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -23,6 +23,11 @@ config ARCH_OMAP3
select CPU_V7
select COMMON_CLKDEV
+config ARCH_OMAP4
+ bool "TI OMAP4"
+ select CPU_V7
+ select ARM_GIC
+
endchoice
comment "OMAP Feature Selections"
@@ -128,13 +133,13 @@ config OMAP_MPU_TIMER
config OMAP_32K_TIMER
bool "Use 32KHz timer"
- depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
+ depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4
help
Select this option if you want to enable the OMAP 32KHz timer.
This timer saves power compared to the OMAP_MPU_TIMER, and has
support for no tick during idle. The 32KHz timer provides less
intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
- currently only available for OMAP16XX, 24XX and 34XX.
+ currently only available for OMAP16XX, 24XX, 34XX and OMAP4.
endchoice
@@ -149,7 +154,7 @@ config OMAP_32K_TIMER_HZ
config OMAP_DM_TIMER
bool "Use dual-mode timer"
- depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
+ depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4
help
Select this option if you want to use OMAP Dual-Mode timers.