diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 19:22:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 19:22:12 -0400 |
commit | fde75430278130505cac21997cd9f90b7bb2670a (patch) | |
tree | 909f659117f5fa8bf1b9b46809f4dc655aee0d34 /arch/arm/mach-omap2/Kconfig | |
parent | 1a4120bc101bdc25ec7258937b5071bf34b19cc5 (diff) | |
parent | db3c47a3af96e8109b1bb114c32f0854259d5970 (diff) |
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc cleanups, part 2, from Arnd Bergmann:
"These omap cleanups have dependencies on earlier omap branches that in
turn depend on other cleanups, so they could not go into the same
branch."
* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
ARM: OMAP2+: dmtimer: cleanup fclk usage
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
ARM: OMAP2+: am33xx: Make am33xx as a separate class
ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
ARM: OMAP3+: dpll: optimize noncore dpll locking logic
ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
ARM: OMAP4: clockdomain/CM code: Update supported transition modes
ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 184469517f15..2776eaacac5e 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL | |||
21 | help | 21 | help |
22 | Compile a kernel suitable for booting most boards | 22 | Compile a kernel suitable for booting most boards |
23 | 23 | ||
24 | config SOC_HAS_OMAP2_SDRC | ||
25 | bool "OMAP2 SDRAM Controller support" | ||
26 | |||
24 | config ARCH_OMAP2 | 27 | config ARCH_OMAP2 |
25 | bool "TI OMAP2" | 28 | bool "TI OMAP2" |
26 | depends on ARCH_OMAP2PLUS | 29 | depends on ARCH_OMAP2PLUS |
27 | default y | 30 | default y |
28 | select CPU_V6 | 31 | select CPU_V6 |
29 | select MULTI_IRQ_HANDLER | 32 | select MULTI_IRQ_HANDLER |
33 | select SOC_HAS_OMAP2_SDRC | ||
30 | 34 | ||
31 | config ARCH_OMAP3 | 35 | config ARCH_OMAP3 |
32 | bool "TI OMAP3" | 36 | bool "TI OMAP3" |
@@ -39,6 +43,7 @@ config ARCH_OMAP3 | |||
39 | select PM_OPP if PM | 43 | select PM_OPP if PM |
40 | select ARM_CPU_SUSPEND if PM | 44 | select ARM_CPU_SUSPEND if PM |
41 | select MULTI_IRQ_HANDLER | 45 | select MULTI_IRQ_HANDLER |
46 | select SOC_HAS_OMAP2_SDRC | ||
42 | 47 | ||
43 | config ARCH_OMAP4 | 48 | config ARCH_OMAP4 |
44 | bool "TI OMAP4" | 49 | bool "TI OMAP4" |
@@ -66,16 +71,19 @@ config SOC_OMAP2420 | |||
66 | depends on ARCH_OMAP2 | 71 | depends on ARCH_OMAP2 |
67 | default y | 72 | default y |
68 | select OMAP_DM_TIMER | 73 | select OMAP_DM_TIMER |
74 | select SOC_HAS_OMAP2_SDRC | ||
69 | 75 | ||
70 | config SOC_OMAP2430 | 76 | config SOC_OMAP2430 |
71 | bool "OMAP2430 support" | 77 | bool "OMAP2430 support" |
72 | depends on ARCH_OMAP2 | 78 | depends on ARCH_OMAP2 |
73 | default y | 79 | default y |
80 | select SOC_HAS_OMAP2_SDRC | ||
74 | 81 | ||
75 | config SOC_OMAP3430 | 82 | config SOC_OMAP3430 |
76 | bool "OMAP3430 support" | 83 | bool "OMAP3430 support" |
77 | depends on ARCH_OMAP3 | 84 | depends on ARCH_OMAP3 |
78 | default y | 85 | default y |
86 | select SOC_HAS_OMAP2_SDRC | ||
79 | 87 | ||
80 | config SOC_TI81XX | 88 | config SOC_TI81XX |
81 | bool "TI81XX support" | 89 | bool "TI81XX support" |
@@ -84,8 +92,10 @@ config SOC_TI81XX | |||
84 | 92 | ||
85 | config SOC_AM33XX | 93 | config SOC_AM33XX |
86 | bool "AM33XX support" | 94 | bool "AM33XX support" |
87 | depends on ARCH_OMAP3 | ||
88 | default y | 95 | default y |
96 | select CPU_V7 | ||
97 | select ARM_CPU_SUSPEND if PM | ||
98 | select MULTI_IRQ_HANDLER | ||
89 | 99 | ||
90 | config OMAP_PACKAGE_ZAF | 100 | config OMAP_PACKAGE_ZAF |
91 | bool | 101 | bool |