1 From 5d102a45ee224fa32c775deb75bf7eb9d2ee2cf0 Mon Sep 17 00:00:00 2001
2 From: Stephen Boyd <sboyd@codeaurora.org>
3 Date: Tue, 3 Jun 2014 11:24:23 -0700
4 Subject: [PATCH 161/182] ARM: Remove ARCH_HAS_CPUFREQ config option
6 This config exists entirely to hide the cpufreq menu from the
7 kernel configuration unless a platform has selected it. Nothing
8 is actually built if this config is 'Y' and it just leads to more
9 patches that add a select under a platform Kconfig so that some
10 other CPUfreq option can be chosen. Let's remove the option so
11 that we can always enable CPUfreq drivers on ARM platforms.
13 Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
14 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
15 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
16 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
18 arch/arm/Kconfig | 17 -----------------
19 arch/arm/mach-davinci/Kconfig | 1 -
20 arch/arm/mach-highbank/Kconfig | 1 -
21 arch/arm/mach-imx/Kconfig | 2 --
22 arch/arm/mach-omap2/Kconfig | 1 -
23 arch/arm/mach-shmobile/Kconfig | 2 --
24 arch/arm/mach-spear/Kconfig | 1 -
25 arch/arm/mach-tegra/Kconfig | 1 -
26 arch/arm/mach-ux500/Kconfig | 1 -
27 arch/arm/mach-vexpress/Kconfig | 1 -
28 arch/arm/mach-vt8500/Kconfig | 1 -
29 11 files changed, 29 deletions(-)
31 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
32 index 4332e8d..1a61d4a 100644
33 --- a/arch/arm/Kconfig
34 +++ b/arch/arm/Kconfig
35 @@ -180,13 +180,6 @@ config ARCH_HAS_ILOG2_U32
36 config ARCH_HAS_ILOG2_U64
39 -config ARCH_HAS_CPUFREQ
42 - Internal node to signify that the ARCH has CPUFREQ support
43 - and that the relevant menu configurations are displayed for
46 config ARCH_HAS_BANDGAP
49 @@ -315,7 +308,6 @@ config ARCH_MULTIPLATFORM
51 config ARCH_INTEGRATOR
52 bool "ARM Ltd. Integrator family"
53 - select ARCH_HAS_CPUFREQ
55 select ARM_PATCH_PHYS_VIRT
57 @@ -540,7 +532,6 @@ config ARCH_DOVE
60 bool "Marvell Kirkwood"
61 - select ARCH_HAS_CPUFREQ
62 select ARCH_REQUIRE_GPIOLIB
64 select GENERIC_CLOCKEVENTS
65 @@ -641,7 +632,6 @@ config ARCH_LPC32XX
67 bool "PXA2xx/PXA3xx-based"
69 - select ARCH_HAS_CPUFREQ
71 select ARCH_REQUIRE_GPIOLIB
72 select ARM_CPU_SUSPEND if PM
73 @@ -710,7 +700,6 @@ config ARCH_RPC
77 - select ARCH_HAS_CPUFREQ
79 select ARCH_REQUIRE_GPIOLIB
80 select ARCH_SPARSEMEM_ENABLE
81 @@ -728,7 +717,6 @@ config ARCH_SA1100
84 bool "Samsung S3C24XX SoCs"
85 - select ARCH_HAS_CPUFREQ
86 select ARCH_REQUIRE_GPIOLIB
88 select CLKSRC_SAMSUNG_PWM
89 @@ -748,7 +736,6 @@ config ARCH_S3C24XX
92 bool "Samsung S3C64XX"
93 - select ARCH_HAS_CPUFREQ
94 select ARCH_REQUIRE_GPIOLIB
97 @@ -809,7 +796,6 @@ config ARCH_S5PC100
100 bool "Samsung S5PV210/S5PC110"
101 - select ARCH_HAS_CPUFREQ
102 select ARCH_HAS_HOLES_MEMORYMODEL
103 select ARCH_SPARSEMEM_ENABLE
105 @@ -863,7 +849,6 @@ config ARCH_DAVINCI
109 - select ARCH_HAS_CPUFREQ
110 select ARCH_HAS_HOLES_MEMORYMODEL
112 select ARCH_REQUIRE_GPIOLIB
113 @@ -2170,9 +2155,7 @@ endmenu
115 menu "CPU Power Management"
118 source "drivers/cpufreq/Kconfig"
121 source "drivers/cpuidle/Kconfig"
123 diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
124 index a075b3e..34cfecc 100644
125 --- a/arch/arm/mach-davinci/Kconfig
126 +++ b/arch/arm/mach-davinci/Kconfig
127 @@ -39,7 +39,6 @@ config ARCH_DAVINCI_DA830
128 config ARCH_DAVINCI_DA850
129 bool "DA850/OMAP-L138/AM18x based system"
130 select ARCH_DAVINCI_DA8XX
131 - select ARCH_HAS_CPUFREQ
134 config ARCH_DAVINCI_DA8XX
135 diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
136 index 0aded64..9f74755 100644
137 --- a/arch/arm/mach-highbank/Kconfig
138 +++ b/arch/arm/mach-highbank/Kconfig
141 bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
142 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
143 - select ARCH_HAS_CPUFREQ
144 select ARCH_HAS_HOLES_MEMORYMODEL
146 select ARCH_SUPPORTS_BIG_ENDIAN
147 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
148 index 33567aa..e7ae0ee 100644
149 --- a/arch/arm/mach-imx/Kconfig
150 +++ b/arch/arm/mach-imx/Kconfig
151 @@ -103,7 +103,6 @@ config SOC_IMX25
155 - select ARCH_HAS_CPUFREQ
158 select IMX_HAVE_IOMUX_V1
159 @@ -129,7 +128,6 @@ config SOC_IMX35
163 - select ARCH_HAS_CPUFREQ
165 select ARCH_MXC_IOMUX_V3
167 diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
168 index 0af7ca0..0674cb7 100644
169 --- a/arch/arm/mach-omap2/Kconfig
170 +++ b/arch/arm/mach-omap2/Kconfig
171 @@ -93,7 +93,6 @@ config SOC_DRA7XX
172 config ARCH_OMAP2PLUS
174 select ARCH_HAS_BANDGAP
175 - select ARCH_HAS_CPUFREQ
176 select ARCH_HAS_HOLES_MEMORYMODEL
178 select ARCH_REQUIRE_GPIOLIB
179 diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
180 index 05fa505..61d4d31 100644
181 --- a/arch/arm/mach-shmobile/Kconfig
182 +++ b/arch/arm/mach-shmobile/Kconfig
183 @@ -85,7 +85,6 @@ config ARCH_R8A73A4
187 - select ARCH_HAS_CPUFREQ
191 @@ -271,7 +270,6 @@ config MACH_KOELSCH
193 bool "KZM-A9-GT board"
194 depends on ARCH_SH73A0
195 - select ARCH_HAS_CPUFREQ
197 select ARCH_REQUIRE_GPIOLIB
198 select REGULATOR_FIXED_VOLTAGE if REGULATOR
199 diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
200 index ac1710e6..811ba13 100644
201 --- a/arch/arm/mach-spear/Kconfig
202 +++ b/arch/arm/mach-spear/Kconfig
203 @@ -16,7 +16,6 @@ if PLAT_SPEAR
204 config ARCH_SPEAR13XX
206 depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
207 - select ARCH_HAS_CPUFREQ
210 select GPIO_SPEAR_SPICS
211 diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
212 index b1232d8..52bfc9e 100644
213 --- a/arch/arm/mach-tegra/Kconfig
214 +++ b/arch/arm/mach-tegra/Kconfig
217 bool "NVIDIA Tegra" if ARCH_MULTI_V7
218 - select ARCH_HAS_CPUFREQ
219 select ARCH_REQUIRE_GPIOLIB
220 select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
222 diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
223 index 0034d2c..cb1176e 100644
224 --- a/arch/arm/mach-ux500/Kconfig
225 +++ b/arch/arm/mach-ux500/Kconfig
226 @@ -3,7 +3,6 @@ config ARCH_U8500
230 - select ARCH_HAS_CPUFREQ
231 select ARCH_REQUIRE_GPIOLIB
233 select ARM_ERRATA_754322
234 diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
235 index 4a70be4..ca5b7e5 100644
236 --- a/arch/arm/mach-vexpress/Kconfig
237 +++ b/arch/arm/mach-vexpress/Kconfig
238 @@ -67,7 +67,6 @@ config ARCH_VEXPRESS_DCSCB
240 config ARCH_VEXPRESS_SPC
241 bool "Versatile Express Serial Power Controller (SPC)"
242 - select ARCH_HAS_CPUFREQ
246 diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
247 index 927be93..788d0b4 100644
248 --- a/arch/arm/mach-vt8500/Kconfig
249 +++ b/arch/arm/mach-vt8500/Kconfig
253 - select ARCH_HAS_CPUFREQ
254 select ARCH_REQUIRE_GPIOLIB