2014-08-30 17:32:58 +08:00
|
|
|
From 5d102a45ee224fa32c775deb75bf7eb9d2ee2cf0 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Stephen Boyd <sboyd@codeaurora.org>
|
|
|
|
Date: Tue, 3 Jun 2014 11:24:23 -0700
|
|
|
|
Subject: [PATCH 161/182] ARM: Remove ARCH_HAS_CPUFREQ config option
|
|
|
|
|
|
|
|
This config exists entirely to hide the cpufreq menu from the
|
|
|
|
kernel configuration unless a platform has selected it. Nothing
|
|
|
|
is actually built if this config is 'Y' and it just leads to more
|
|
|
|
patches that add a select under a platform Kconfig so that some
|
|
|
|
other CPUfreq option can be chosen. Let's remove the option so
|
|
|
|
that we can always enable CPUfreq drivers on ARM platforms.
|
|
|
|
|
|
|
|
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
|
|
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
|
|
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
|
|
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
|
|
|
|
---
|
|
|
|
arch/arm/Kconfig | 17 -----------------
|
|
|
|
arch/arm/mach-davinci/Kconfig | 1 -
|
|
|
|
arch/arm/mach-highbank/Kconfig | 1 -
|
|
|
|
arch/arm/mach-imx/Kconfig | 2 --
|
|
|
|
arch/arm/mach-omap2/Kconfig | 1 -
|
|
|
|
arch/arm/mach-shmobile/Kconfig | 2 --
|
|
|
|
arch/arm/mach-spear/Kconfig | 1 -
|
|
|
|
arch/arm/mach-tegra/Kconfig | 1 -
|
|
|
|
arch/arm/mach-ux500/Kconfig | 1 -
|
|
|
|
arch/arm/mach-vexpress/Kconfig | 1 -
|
|
|
|
arch/arm/mach-vt8500/Kconfig | 1 -
|
|
|
|
11 files changed, 29 deletions(-)
|
|
|
|
|
|
|
|
--- a/arch/arm/Kconfig
|
|
|
|
+++ b/arch/arm/Kconfig
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -181,13 +181,6 @@ config ARCH_HAS_ILOG2_U32
|
2014-08-30 17:32:58 +08:00
|
|
|
config ARCH_HAS_ILOG2_U64
|
|
|
|
bool
|
|
|
|
|
|
|
|
-config ARCH_HAS_CPUFREQ
|
|
|
|
- bool
|
|
|
|
- help
|
|
|
|
- Internal node to signify that the ARCH has CPUFREQ support
|
|
|
|
- and that the relevant menu configurations are displayed for
|
|
|
|
- it.
|
|
|
|
-
|
|
|
|
config ARCH_HAS_BANDGAP
|
|
|
|
bool
|
|
|
|
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -316,7 +309,6 @@ config ARCH_MULTIPLATFORM
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
config ARCH_INTEGRATOR
|
|
|
|
bool "ARM Ltd. Integrator family"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARM_AMBA
|
|
|
|
select ARM_PATCH_PHYS_VIRT
|
|
|
|
select AUTO_ZRELADDR
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -541,7 +533,6 @@ config ARCH_DOVE
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
config ARCH_KIRKWOOD
|
|
|
|
bool "Marvell Kirkwood"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select CPU_FEROCEON
|
|
|
|
select GENERIC_CLOCKEVENTS
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -642,7 +633,6 @@ config ARCH_LPC32XX
|
2014-08-30 17:32:58 +08:00
|
|
|
config ARCH_PXA
|
|
|
|
bool "PXA2xx/PXA3xx-based"
|
|
|
|
depends on MMU
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_MTD_XIP
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select ARM_CPU_SUSPEND if PM
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -711,7 +701,6 @@ config ARCH_RPC
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
config ARCH_SA1100
|
|
|
|
bool "SA1100-based"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_MTD_XIP
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select ARCH_SPARSEMEM_ENABLE
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -729,7 +718,6 @@ config ARCH_SA1100
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
config ARCH_S3C24XX
|
|
|
|
bool "Samsung S3C24XX SoCs"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select CLKDEV_LOOKUP
|
|
|
|
select CLKSRC_SAMSUNG_PWM
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -749,7 +737,6 @@ config ARCH_S3C24XX
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
config ARCH_S3C64XX
|
|
|
|
bool "Samsung S3C64XX"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select ARM_AMBA
|
|
|
|
select ARM_VIC
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -810,7 +797,6 @@ config ARCH_S5PC100
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
config ARCH_S5PV210
|
|
|
|
bool "Samsung S5PV210/S5PC110"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
|
|
|
select ARCH_SPARSEMEM_ENABLE
|
|
|
|
select CLKDEV_LOOKUP
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -864,7 +850,6 @@ config ARCH_DAVINCI
|
2014-08-30 17:32:58 +08:00
|
|
|
config ARCH_OMAP1
|
|
|
|
bool "TI OMAP1"
|
|
|
|
depends on MMU
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
|
|
|
select ARCH_OMAP
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
2014-09-11 05:40:19 +08:00
|
|
|
@@ -2171,9 +2156,7 @@ endmenu
|
2014-08-30 17:32:58 +08:00
|
|
|
|
|
|
|
menu "CPU Power Management"
|
|
|
|
|
|
|
|
-if ARCH_HAS_CPUFREQ
|
|
|
|
source "drivers/cpufreq/Kconfig"
|
|
|
|
-endif
|
|
|
|
|
|
|
|
source "drivers/cpuidle/Kconfig"
|
|
|
|
|
|
|
|
--- a/arch/arm/mach-davinci/Kconfig
|
|
|
|
+++ b/arch/arm/mach-davinci/Kconfig
|
|
|
|
@@ -39,7 +39,6 @@ config ARCH_DAVINCI_DA830
|
|
|
|
config ARCH_DAVINCI_DA850
|
|
|
|
bool "DA850/OMAP-L138/AM18x based system"
|
|
|
|
select ARCH_DAVINCI_DA8XX
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select CP_INTC
|
|
|
|
|
|
|
|
config ARCH_DAVINCI_DA8XX
|
|
|
|
--- a/arch/arm/mach-highbank/Kconfig
|
|
|
|
+++ b/arch/arm/mach-highbank/Kconfig
|
|
|
|
@@ -1,7 +1,6 @@
|
|
|
|
config ARCH_HIGHBANK
|
|
|
|
bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
|
|
|
|
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
|
|
|
select ARCH_HAS_OPP
|
|
|
|
select ARCH_SUPPORTS_BIG_ENDIAN
|
|
|
|
--- a/arch/arm/mach-imx/Kconfig
|
|
|
|
+++ b/arch/arm/mach-imx/Kconfig
|
|
|
|
@@ -103,7 +103,6 @@ config SOC_IMX25
|
|
|
|
|
|
|
|
config SOC_IMX27
|
|
|
|
bool
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_OPP
|
|
|
|
select CPU_ARM926T
|
|
|
|
select IMX_HAVE_IOMUX_V1
|
|
|
|
@@ -129,7 +128,6 @@ config SOC_IMX35
|
|
|
|
|
|
|
|
config SOC_IMX5
|
|
|
|
bool
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_OPP
|
|
|
|
select ARCH_MXC_IOMUX_V3
|
|
|
|
select CPU_V7
|
|
|
|
--- a/arch/arm/mach-omap2/Kconfig
|
|
|
|
+++ b/arch/arm/mach-omap2/Kconfig
|
|
|
|
@@ -93,7 +93,6 @@ config SOC_DRA7XX
|
|
|
|
config ARCH_OMAP2PLUS
|
|
|
|
bool
|
|
|
|
select ARCH_HAS_BANDGAP
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
|
|
|
select ARCH_OMAP
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
--- a/arch/arm/mach-shmobile/Kconfig
|
|
|
|
+++ b/arch/arm/mach-shmobile/Kconfig
|
|
|
|
@@ -85,7 +85,6 @@ config ARCH_R8A73A4
|
|
|
|
select CPU_V7
|
|
|
|
select SH_CLK_CPG
|
|
|
|
select RENESAS_IRQC
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_OPP
|
|
|
|
|
|
|
|
config ARCH_R8A7740
|
|
|
|
@@ -271,7 +270,6 @@ config MACH_KOELSCH
|
|
|
|
config MACH_KZM9G
|
|
|
|
bool "KZM-A9-GT board"
|
|
|
|
depends on ARCH_SH73A0
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_OPP
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
|
|
|
--- a/arch/arm/mach-spear/Kconfig
|
|
|
|
+++ b/arch/arm/mach-spear/Kconfig
|
|
|
|
@@ -16,7 +16,6 @@ if PLAT_SPEAR
|
|
|
|
config ARCH_SPEAR13XX
|
|
|
|
bool "ST SPEAr13xx"
|
|
|
|
depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARM_GIC
|
|
|
|
select CPU_V7
|
|
|
|
select GPIO_SPEAR_SPICS
|
|
|
|
--- a/arch/arm/mach-tegra/Kconfig
|
|
|
|
+++ b/arch/arm/mach-tegra/Kconfig
|
|
|
|
@@ -1,6 +1,5 @@
|
|
|
|
config ARCH_TEGRA
|
|
|
|
bool "NVIDIA Tegra" if ARCH_MULTI_V7
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
|
|
|
|
select ARM_GIC
|
|
|
|
--- a/arch/arm/mach-ux500/Kconfig
|
|
|
|
+++ b/arch/arm/mach-ux500/Kconfig
|
|
|
|
@@ -3,7 +3,6 @@ config ARCH_U8500
|
|
|
|
depends on MMU
|
|
|
|
select AB8500_CORE
|
|
|
|
select ABX500_CORE
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select ARM_AMBA
|
|
|
|
select ARM_ERRATA_754322
|
|
|
|
--- a/arch/arm/mach-vexpress/Kconfig
|
|
|
|
+++ b/arch/arm/mach-vexpress/Kconfig
|
|
|
|
@@ -67,7 +67,6 @@ config ARCH_VEXPRESS_DCSCB
|
|
|
|
|
|
|
|
config ARCH_VEXPRESS_SPC
|
|
|
|
bool "Versatile Express Serial Power Controller (SPC)"
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_HAS_OPP
|
|
|
|
select PM_OPP
|
|
|
|
help
|
|
|
|
--- a/arch/arm/mach-vt8500/Kconfig
|
|
|
|
+++ b/arch/arm/mach-vt8500/Kconfig
|
|
|
|
@@ -1,6 +1,5 @@
|
|
|
|
config ARCH_VT8500
|
|
|
|
bool
|
|
|
|
- select ARCH_HAS_CPUFREQ
|
|
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
|
|
select CLKDEV_LOOKUP
|
|
|
|
select CLKSRC_OF
|