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 --- a/arch/arm/Kconfig
32 +++ b/arch/arm/Kconfig
33 @@ -181,13 +181,6 @@ config ARCH_HAS_ILOG2_U32
34 config ARCH_HAS_ILOG2_U64
37 -config ARCH_HAS_CPUFREQ
40 - Internal node to signify that the ARCH has CPUFREQ support
41 - and that the relevant menu configurations are displayed for
44 config ARCH_HAS_BANDGAP
47 @@ -316,7 +309,6 @@ config ARCH_MULTIPLATFORM
49 config ARCH_INTEGRATOR
50 bool "ARM Ltd. Integrator family"
51 - select ARCH_HAS_CPUFREQ
53 select ARM_PATCH_PHYS_VIRT
55 @@ -541,7 +533,6 @@ config ARCH_DOVE
58 bool "Marvell Kirkwood"
59 - select ARCH_HAS_CPUFREQ
60 select ARCH_REQUIRE_GPIOLIB
62 select GENERIC_CLOCKEVENTS
63 @@ -642,7 +633,6 @@ config ARCH_LPC32XX
65 bool "PXA2xx/PXA3xx-based"
67 - select ARCH_HAS_CPUFREQ
69 select ARCH_REQUIRE_GPIOLIB
70 select ARM_CPU_SUSPEND if PM
71 @@ -711,7 +701,6 @@ config ARCH_RPC
75 - select ARCH_HAS_CPUFREQ
77 select ARCH_REQUIRE_GPIOLIB
78 select ARCH_SPARSEMEM_ENABLE
79 @@ -729,7 +718,6 @@ config ARCH_SA1100
82 bool "Samsung S3C24XX SoCs"
83 - select ARCH_HAS_CPUFREQ
84 select ARCH_REQUIRE_GPIOLIB
86 select CLKSRC_SAMSUNG_PWM
87 @@ -749,7 +737,6 @@ config ARCH_S3C24XX
90 bool "Samsung S3C64XX"
91 - select ARCH_HAS_CPUFREQ
92 select ARCH_REQUIRE_GPIOLIB
95 @@ -810,7 +797,6 @@ config ARCH_S5PC100
98 bool "Samsung S5PV210/S5PC110"
99 - select ARCH_HAS_CPUFREQ
100 select ARCH_HAS_HOLES_MEMORYMODEL
101 select ARCH_SPARSEMEM_ENABLE
103 @@ -864,7 +850,6 @@ config ARCH_DAVINCI
107 - select ARCH_HAS_CPUFREQ
108 select ARCH_HAS_HOLES_MEMORYMODEL
110 select ARCH_REQUIRE_GPIOLIB
111 @@ -2171,9 +2156,7 @@ endmenu
113 menu "CPU Power Management"
116 source "drivers/cpufreq/Kconfig"
119 source "drivers/cpuidle/Kconfig"
121 --- a/arch/arm/mach-davinci/Kconfig
122 +++ b/arch/arm/mach-davinci/Kconfig
123 @@ -39,7 +39,6 @@ config ARCH_DAVINCI_DA830
124 config ARCH_DAVINCI_DA850
125 bool "DA850/OMAP-L138/AM18x based system"
126 select ARCH_DAVINCI_DA8XX
127 - select ARCH_HAS_CPUFREQ
130 config ARCH_DAVINCI_DA8XX
131 --- a/arch/arm/mach-highbank/Kconfig
132 +++ b/arch/arm/mach-highbank/Kconfig
135 bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
136 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
137 - select ARCH_HAS_CPUFREQ
138 select ARCH_HAS_HOLES_MEMORYMODEL
140 select ARCH_SUPPORTS_BIG_ENDIAN
141 --- a/arch/arm/mach-imx/Kconfig
142 +++ b/arch/arm/mach-imx/Kconfig
143 @@ -103,7 +103,6 @@ config SOC_IMX25
147 - select ARCH_HAS_CPUFREQ
150 select IMX_HAVE_IOMUX_V1
151 @@ -129,7 +128,6 @@ config SOC_IMX35
155 - select ARCH_HAS_CPUFREQ
157 select ARCH_MXC_IOMUX_V3
159 --- a/arch/arm/mach-omap2/Kconfig
160 +++ b/arch/arm/mach-omap2/Kconfig
161 @@ -93,7 +93,6 @@ config SOC_DRA7XX
162 config ARCH_OMAP2PLUS
164 select ARCH_HAS_BANDGAP
165 - select ARCH_HAS_CPUFREQ
166 select ARCH_HAS_HOLES_MEMORYMODEL
168 select ARCH_REQUIRE_GPIOLIB
169 --- a/arch/arm/mach-shmobile/Kconfig
170 +++ b/arch/arm/mach-shmobile/Kconfig
171 @@ -85,7 +85,6 @@ config ARCH_R8A73A4
175 - select ARCH_HAS_CPUFREQ
179 @@ -271,7 +270,6 @@ config MACH_KOELSCH
181 bool "KZM-A9-GT board"
182 depends on ARCH_SH73A0
183 - select ARCH_HAS_CPUFREQ
185 select ARCH_REQUIRE_GPIOLIB
186 select REGULATOR_FIXED_VOLTAGE if REGULATOR
187 --- a/arch/arm/mach-spear/Kconfig
188 +++ b/arch/arm/mach-spear/Kconfig
189 @@ -16,7 +16,6 @@ if PLAT_SPEAR
190 config ARCH_SPEAR13XX
192 depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
193 - select ARCH_HAS_CPUFREQ
196 select GPIO_SPEAR_SPICS
197 --- a/arch/arm/mach-tegra/Kconfig
198 +++ b/arch/arm/mach-tegra/Kconfig
201 bool "NVIDIA Tegra" if ARCH_MULTI_V7
202 - select ARCH_HAS_CPUFREQ
203 select ARCH_REQUIRE_GPIOLIB
204 select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
206 --- a/arch/arm/mach-ux500/Kconfig
207 +++ b/arch/arm/mach-ux500/Kconfig
208 @@ -3,7 +3,6 @@ config ARCH_U8500
212 - select ARCH_HAS_CPUFREQ
213 select ARCH_REQUIRE_GPIOLIB
215 select ARM_ERRATA_754322
216 --- a/arch/arm/mach-vexpress/Kconfig
217 +++ b/arch/arm/mach-vexpress/Kconfig
218 @@ -67,7 +67,6 @@ config ARCH_VEXPRESS_DCSCB
220 config ARCH_VEXPRESS_SPC
221 bool "Versatile Express Serial Power Controller (SPC)"
222 - select ARCH_HAS_CPUFREQ
226 --- a/arch/arm/mach-vt8500/Kconfig
227 +++ b/arch/arm/mach-vt8500/Kconfig
231 - select ARCH_HAS_CPUFREQ
232 select ARCH_REQUIRE_GPIOLIB