260 lines
7.4 KiB
Diff
260 lines
7.4 KiB
Diff
|
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(-)
|
||
|
|
||
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||
|
index 4332e8d..1a61d4a 100644
|
||
|
--- a/arch/arm/Kconfig
|
||
|
+++ b/arch/arm/Kconfig
|
||
|
@@ -180,13 +180,6 @@ config ARCH_HAS_ILOG2_U32
|
||
|
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
|
||
|
|
||
|
@@ -315,7 +308,6 @@ config ARCH_MULTIPLATFORM
|
||
|
|
||
|
config ARCH_INTEGRATOR
|
||
|
bool "ARM Ltd. Integrator family"
|
||
|
- select ARCH_HAS_CPUFREQ
|
||
|
select ARM_AMBA
|
||
|
select ARM_PATCH_PHYS_VIRT
|
||
|
select AUTO_ZRELADDR
|
||
|
@@ -540,7 +532,6 @@ config ARCH_DOVE
|
||
|
|
||
|
config ARCH_KIRKWOOD
|
||
|
bool "Marvell Kirkwood"
|
||
|
- select ARCH_HAS_CPUFREQ
|
||
|
select ARCH_REQUIRE_GPIOLIB
|
||
|
select CPU_FEROCEON
|
||
|
select GENERIC_CLOCKEVENTS
|
||
|
@@ -641,7 +632,6 @@ config ARCH_LPC32XX
|
||
|
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
|
||
|
@@ -710,7 +700,6 @@ config ARCH_RPC
|
||
|
|
||
|
config ARCH_SA1100
|
||
|
bool "SA1100-based"
|
||
|
- select ARCH_HAS_CPUFREQ
|
||
|
select ARCH_MTD_XIP
|
||
|
select ARCH_REQUIRE_GPIOLIB
|
||
|
select ARCH_SPARSEMEM_ENABLE
|
||
|
@@ -728,7 +717,6 @@ config ARCH_SA1100
|
||
|
|
||
|
config ARCH_S3C24XX
|
||
|
bool "Samsung S3C24XX SoCs"
|
||
|
- select ARCH_HAS_CPUFREQ
|
||
|
select ARCH_REQUIRE_GPIOLIB
|
||
|
select CLKDEV_LOOKUP
|
||
|
select CLKSRC_SAMSUNG_PWM
|
||
|
@@ -748,7 +736,6 @@ config ARCH_S3C24XX
|
||
|
|
||
|
config ARCH_S3C64XX
|
||
|
bool "Samsung S3C64XX"
|
||
|
- select ARCH_HAS_CPUFREQ
|
||
|
select ARCH_REQUIRE_GPIOLIB
|
||
|
select ARM_AMBA
|
||
|
select ARM_VIC
|
||
|
@@ -809,7 +796,6 @@ config ARCH_S5PC100
|
||
|
|
||
|
config ARCH_S5PV210
|
||
|
bool "Samsung S5PV210/S5PC110"
|
||
|
- select ARCH_HAS_CPUFREQ
|
||
|
select ARCH_HAS_HOLES_MEMORYMODEL
|
||
|
select ARCH_SPARSEMEM_ENABLE
|
||
|
select CLKDEV_LOOKUP
|
||
|
@@ -863,7 +849,6 @@ config ARCH_DAVINCI
|
||
|
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
|
||
|
@@ -2170,9 +2155,7 @@ endmenu
|
||
|
|
||
|
menu "CPU Power Management"
|
||
|
|
||
|
-if ARCH_HAS_CPUFREQ
|
||
|
source "drivers/cpufreq/Kconfig"
|
||
|
-endif
|
||
|
|
||
|
source "drivers/cpuidle/Kconfig"
|
||
|
|
||
|
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
|
||
|
index a075b3e..34cfecc 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
|
||
|
index 0aded64..9f74755 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
|
||
|
index 33567aa..e7ae0ee 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
|
||
|
index 0af7ca0..0674cb7 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
|
||
|
index 05fa505..61d4d31 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
|
||
|
index ac1710e6..811ba13 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
|
||
|
index b1232d8..52bfc9e 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
|
||
|
index 0034d2c..cb1176e 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
|
||
|
index 4a70be4..ca5b7e5 100644
|
||
|
--- 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
|
||
|
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
|
||
|
index 927be93..788d0b4 100644
|
||
|
--- 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
|
||
|
--
|
||
|
1.7.10.4
|
||
|
|