diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 22:28:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 22:28:15 -0400 |
commit | 0df0914d414a504b975f3cc66ace0c16ef55b7f3 (patch) | |
tree | c97ffa357943a8b226cdec1b9632c4cede813205 /arch/arm/mach-omap2/Kconfig | |
parent | 6899608533410557e6698cb9d4ff6df553916e98 (diff) | |
parent | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (diff) |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
omap: zoom: host should not pull up wl1271's irq line
arm: plat-omap: iommu: fix request_mem_region() error path
OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
omap4: mux: Remove duplicate mux modes
omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
omap4: board-omap4panda: Initialise the serial pads
omap3: board-3430sdp: Initialise the serial pads
omap4: board-4430sdp: Initialise the serial pads
omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
omap2+: mux: Remove the use of IDLE flag
omap2+: Add separate list for dynamic pads to mux
perf: add OMAP support for the new power events
OMAP4: Add IVA OPP enteries.
OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
OMAP3+: OPP: Replace voltage values with Macros
OMAP3: wdtimer: Fix CORE idle transition
Watchdog: omap_wdt: add fine grain runtime-pm
...
Fix up various conflicts in
- arch/arm/mach-omap2/board-omap3evm.c
- arch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/usb-musb.c
- arch/arm/plat-omap/include/plat/usb.h
- drivers/usb/musb/musb_core.h
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b69fa0a0299e..eeab35dea07e 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -54,25 +54,30 @@ config ARCH_OMAP4 | |||
54 | comment "OMAP Core Type" | 54 | comment "OMAP Core Type" |
55 | depends on ARCH_OMAP2 | 55 | depends on ARCH_OMAP2 |
56 | 56 | ||
57 | config ARCH_OMAP2420 | 57 | config SOC_OMAP2420 |
58 | bool "OMAP2420 support" | 58 | bool "OMAP2420 support" |
59 | depends on ARCH_OMAP2 | 59 | depends on ARCH_OMAP2 |
60 | default y | 60 | default y |
61 | select OMAP_DM_TIMER | 61 | select OMAP_DM_TIMER |
62 | select ARCH_OMAP_OTG | 62 | select ARCH_OMAP_OTG |
63 | 63 | ||
64 | config ARCH_OMAP2430 | 64 | config SOC_OMAP2430 |
65 | bool "OMAP2430 support" | 65 | bool "OMAP2430 support" |
66 | depends on ARCH_OMAP2 | 66 | depends on ARCH_OMAP2 |
67 | default y | 67 | default y |
68 | select ARCH_OMAP_OTG | 68 | select ARCH_OMAP_OTG |
69 | 69 | ||
70 | config ARCH_OMAP3430 | 70 | config SOC_OMAP3430 |
71 | bool "OMAP3430 support" | 71 | bool "OMAP3430 support" |
72 | depends on ARCH_OMAP3 | 72 | depends on ARCH_OMAP3 |
73 | default y | 73 | default y |
74 | select ARCH_OMAP_OTG | 74 | select ARCH_OMAP_OTG |
75 | 75 | ||
76 | config SOC_OMAPTI816X | ||
77 | bool "TI816X support" | ||
78 | depends on ARCH_OMAP3 | ||
79 | default y | ||
80 | |||
76 | config OMAP_PACKAGE_ZAF | 81 | config OMAP_PACKAGE_ZAF |
77 | bool | 82 | bool |
78 | 83 | ||
@@ -107,25 +112,25 @@ config MACH_OMAP_GENERIC | |||
107 | 112 | ||
108 | config MACH_OMAP2_TUSB6010 | 113 | config MACH_OMAP2_TUSB6010 |
109 | bool | 114 | bool |
110 | depends on ARCH_OMAP2 && ARCH_OMAP2420 | 115 | depends on ARCH_OMAP2 && SOC_OMAP2420 |
111 | default y if MACH_NOKIA_N8X0 | 116 | default y if MACH_NOKIA_N8X0 |
112 | 117 | ||
113 | config MACH_OMAP_H4 | 118 | config MACH_OMAP_H4 |
114 | bool "OMAP 2420 H4 board" | 119 | bool "OMAP 2420 H4 board" |
115 | depends on ARCH_OMAP2420 | 120 | depends on SOC_OMAP2420 |
116 | default y | 121 | default y |
117 | select OMAP_PACKAGE_ZAF | 122 | select OMAP_PACKAGE_ZAF |
118 | select OMAP_DEBUG_DEVICES | 123 | select OMAP_DEBUG_DEVICES |
119 | 124 | ||
120 | config MACH_OMAP_APOLLON | 125 | config MACH_OMAP_APOLLON |
121 | bool "OMAP 2420 Apollon board" | 126 | bool "OMAP 2420 Apollon board" |
122 | depends on ARCH_OMAP2420 | 127 | depends on SOC_OMAP2420 |
123 | default y | 128 | default y |
124 | select OMAP_PACKAGE_ZAC | 129 | select OMAP_PACKAGE_ZAC |
125 | 130 | ||
126 | config MACH_OMAP_2430SDP | 131 | config MACH_OMAP_2430SDP |
127 | bool "OMAP 2430 SDP board" | 132 | bool "OMAP 2430 SDP board" |
128 | depends on ARCH_OMAP2430 | 133 | depends on SOC_OMAP2430 |
129 | default y | 134 | default y |
130 | select OMAP_PACKAGE_ZAC | 135 | select OMAP_PACKAGE_ZAC |
131 | 136 | ||
@@ -220,7 +225,7 @@ config MACH_NOKIA_N810_WIMAX | |||
220 | 225 | ||
221 | config MACH_NOKIA_N8X0 | 226 | config MACH_NOKIA_N8X0 |
222 | bool "Nokia N800/N810" | 227 | bool "Nokia N800/N810" |
223 | depends on ARCH_OMAP2420 | 228 | depends on SOC_OMAP2420 |
224 | default y | 229 | default y |
225 | select OMAP_PACKAGE_ZAC | 230 | select OMAP_PACKAGE_ZAC |
226 | select MACH_NOKIA_N800 | 231 | select MACH_NOKIA_N800 |
@@ -295,12 +300,18 @@ config MACH_OMAP_3630SDP | |||
295 | default y | 300 | default y |
296 | select OMAP_PACKAGE_CBP | 301 | select OMAP_PACKAGE_CBP |
297 | 302 | ||
303 | config MACH_TI8168EVM | ||
304 | bool "TI8168 Evaluation Module" | ||
305 | depends on SOC_OMAPTI816X | ||
306 | default y | ||
307 | |||
298 | config MACH_OMAP_4430SDP | 308 | config MACH_OMAP_4430SDP |
299 | bool "OMAP 4430 SDP board" | 309 | bool "OMAP 4430 SDP board" |
300 | default y | 310 | default y |
301 | depends on ARCH_OMAP4 | 311 | depends on ARCH_OMAP4 |
302 | select OMAP_PACKAGE_CBL | 312 | select OMAP_PACKAGE_CBL |
303 | select OMAP_PACKAGE_CBS | 313 | select OMAP_PACKAGE_CBS |
314 | select REGULATOR_FIXED_VOLTAGE | ||
304 | 315 | ||
305 | config MACH_OMAP4_PANDA | 316 | config MACH_OMAP4_PANDA |
306 | bool "OMAP4 Panda Board" | 317 | bool "OMAP4 Panda Board" |
@@ -308,6 +319,7 @@ config MACH_OMAP4_PANDA | |||
308 | depends on ARCH_OMAP4 | 319 | depends on ARCH_OMAP4 |
309 | select OMAP_PACKAGE_CBL | 320 | select OMAP_PACKAGE_CBL |
310 | select OMAP_PACKAGE_CBS | 321 | select OMAP_PACKAGE_CBS |
322 | select REGULATOR_FIXED_VOLTAGE | ||
311 | 323 | ||
312 | config OMAP3_EMU | 324 | config OMAP3_EMU |
313 | bool "OMAP3 debugging peripherals" | 325 | bool "OMAP3 debugging peripherals" |