diff options
author | Rajendra Nayak <rnayak@ti.com> | 2012-04-27 06:57:51 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-11-12 21:18:50 -0500 |
commit | f7f73aab3d5bd19ba0f72ff00fb6b3be28e1a4d3 (patch) | |
tree | 5f174157648277066b78afa7b050440a1cac9f56 /arch/arm/mach-omap2/Kconfig | |
parent | 6ab9f69e7e03566edb8ed58a351a5faee3b5fca6 (diff) |
ARM: OMAP: clock: Switch to COMMON clk
Select COMMON_CLK for all OMAP2+ SoCs and switch over to using new
data files for OMAP2/3/4.
The older data files will get removed in subsequent patches.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: move 'select COMMON_CLK' from ARCH_OMAP2PLUS_TYPICAL to
the per-SoC and per-"arch" Kconfig sections]
[mturquette@ti.com: fixed up #ifdef mismatch in clock.h in previous
patch which drops that change from this patch]
Signed-off-by: Mike Turquette <mturquette@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 2a1a898c7f90..98268fa66a3b 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -35,6 +35,7 @@ config ARCH_OMAP2 | |||
35 | select CPU_V6 | 35 | select CPU_V6 |
36 | select MULTI_IRQ_HANDLER | 36 | select MULTI_IRQ_HANDLER |
37 | select SOC_HAS_OMAP2_SDRC | 37 | select SOC_HAS_OMAP2_SDRC |
38 | select COMMON_CLK | ||
38 | 39 | ||
39 | config ARCH_OMAP3 | 40 | config ARCH_OMAP3 |
40 | bool "TI OMAP3" | 41 | bool "TI OMAP3" |
@@ -48,6 +49,7 @@ config ARCH_OMAP3 | |||
48 | select PM_OPP if PM | 49 | select PM_OPP if PM |
49 | select PM_RUNTIME if CPU_IDLE | 50 | select PM_RUNTIME if CPU_IDLE |
50 | select SOC_HAS_OMAP2_SDRC | 51 | select SOC_HAS_OMAP2_SDRC |
52 | select COMMON_CLK | ||
51 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 53 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
52 | 54 | ||
53 | config ARCH_OMAP4 | 55 | config ARCH_OMAP4 |
@@ -69,6 +71,7 @@ config ARCH_OMAP4 | |||
69 | select PM_OPP if PM | 71 | select PM_OPP if PM |
70 | select PM_RUNTIME if CPU_IDLE | 72 | select PM_RUNTIME if CPU_IDLE |
71 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 73 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
74 | select COMMON_CLK | ||
72 | 75 | ||
73 | config SOC_OMAP5 | 76 | config SOC_OMAP5 |
74 | bool "TI OMAP5" | 77 | bool "TI OMAP5" |
@@ -78,6 +81,7 @@ config SOC_OMAP5 | |||
78 | select CPU_V7 | 81 | select CPU_V7 |
79 | select HAVE_SMP | 82 | select HAVE_SMP |
80 | select SOC_HAS_REALTIME_COUNTER | 83 | select SOC_HAS_REALTIME_COUNTER |
84 | select COMMON_CLK | ||
81 | 85 | ||
82 | comment "OMAP Core Type" | 86 | comment "OMAP Core Type" |
83 | depends on ARCH_OMAP2 | 87 | depends on ARCH_OMAP2 |
@@ -112,6 +116,7 @@ config SOC_AM33XX | |||
112 | select ARM_CPU_SUSPEND if PM | 116 | select ARM_CPU_SUSPEND if PM |
113 | select CPU_V7 | 117 | select CPU_V7 |
114 | select MULTI_IRQ_HANDLER | 118 | select MULTI_IRQ_HANDLER |
119 | select COMMON_CLK | ||
115 | 120 | ||
116 | config OMAP_PACKAGE_ZAF | 121 | config OMAP_PACKAGE_ZAF |
117 | bool | 122 | bool |