aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-05-29 15:03:43 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-05-29 15:03:43 -0400
commit949abd84cd54ff864efca9df822d1e02a56694ec (patch)
tree0c0e7696a51e2989f11a37478ff26368cab0e227 /arch/arm/plat-omap/Kconfig
parentb0958aed1ea39825439a7848544bfb2e267273b4 (diff)
parentcd07ecc828486e5887113c7dc4d9f9022145811b (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Conflicts: arch/arm/Makefile
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
-rw-r--r--arch/arm/plat-omap/Kconfig13
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index d483b2592ec8..9a6ecc7159b7 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -23,6 +23,11 @@ config ARCH_OMAP3
23 select CPU_V7 23 select CPU_V7
24 select COMMON_CLKDEV 24 select COMMON_CLKDEV
25 25
26config ARCH_OMAP4
27 bool "TI OMAP4"
28 select CPU_V7
29 select ARM_GIC
30
26endchoice 31endchoice
27 32
28comment "OMAP Feature Selections" 33comment "OMAP Feature Selections"
@@ -131,13 +136,13 @@ config OMAP_MPU_TIMER
131 136
132config OMAP_32K_TIMER 137config OMAP_32K_TIMER
133 bool "Use 32KHz timer" 138 bool "Use 32KHz timer"
134 depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX 139 depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4
135 help 140 help
136 Select this option if you want to enable the OMAP 32KHz timer. 141 Select this option if you want to enable the OMAP 32KHz timer.
137 This timer saves power compared to the OMAP_MPU_TIMER, and has 142 This timer saves power compared to the OMAP_MPU_TIMER, and has
138 support for no tick during idle. The 32KHz timer provides less 143 support for no tick during idle. The 32KHz timer provides less
139 intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is 144 intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
140 currently only available for OMAP16XX, 24XX and 34XX. 145 currently only available for OMAP16XX, 24XX, 34XX and OMAP4.
141 146
142endchoice 147endchoice
143 148
@@ -152,7 +157,7 @@ config OMAP_32K_TIMER_HZ
152 157
153config OMAP_DM_TIMER 158config OMAP_DM_TIMER
154 bool "Use dual-mode timer" 159 bool "Use dual-mode timer"
155 depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX 160 depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4
156 help 161 help
157 Select this option if you want to use OMAP Dual-Mode timers. 162 Select this option if you want to use OMAP Dual-Mode timers.
158 163
@@ -174,7 +179,7 @@ endchoice
174 179
175config OMAP_SERIAL_WAKE 180config OMAP_SERIAL_WAKE
176 bool "Enable wake-up events for serial ports" 181 bool "Enable wake-up events for serial ports"
177 depends on OMAP_MUX 182 depends on ARCH_OMAP1 && OMAP_MUX
178 default y 183 default y
179 help 184 help
180 Select this option if you want to have your system wake up 185 Select this option if you want to have your system wake up