aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-22 10:43:12 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-22 18:51:30 -0400
commit78c5e0bb145d3eac719fcad1ac1df763a71cf632 (patch)
tree804c92ee055e2247cf0537ae2cee14cb81892481
parent9a3c4145af32125c5ee39c0272662b47307a8323 (diff)
PM / OPP: Remove ARCH_HAS_OPP
Since the OPP layer is a kernel library which has been converted to be directly selectable by its callers rather than user selectable and requiring architectures to enable it explicitly the ARCH_HAS_OPP symbol has become redundant and can be removed. Do so. Signed-off-by: Mark Brown <broonie@linaro.org> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Rob Herring <robh@kernel.org> Acked-by: Shawn Guo <shawn.guo@freescale.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--Documentation/power/opp.txt3
-rw-r--r--arch/arm/mach-exynos/Kconfig1
-rw-r--r--arch/arm/mach-highbank/Kconfig1
-rw-r--r--arch/arm/mach-imx/Kconfig1
-rw-r--r--arch/arm/mach-omap2/Kconfig1
-rw-r--r--arch/arm/mach-shmobile/Kconfig2
-rw-r--r--arch/arm/mach-vexpress/Kconfig1
-rw-r--r--arch/arm/mach-zynq/Kconfig1
-rw-r--r--drivers/devfreq/Kconfig1
-rw-r--r--kernel/power/Kconfig3
10 files changed, 0 insertions, 15 deletions
diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt
index a9adad828cdc..c6279c2be47c 100644
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
@@ -51,9 +51,6 @@ Typical usage of the OPP library is as follows:
51SoC framework -> modifies on required cases certain OPPs -> OPP layer 51SoC framework -> modifies on required cases certain OPPs -> OPP layer
52 -> queries to search/retrieve information -> 52 -> queries to search/retrieve information ->
53 53
54Architectures that provide a SoC framework for OPP should select ARCH_HAS_OPP
55to make the OPP layer available.
56
57OPP layer expects each domain to be represented by a unique device pointer. SoC 54OPP layer expects each domain to be represented by a unique device pointer. SoC
58framework registers a set of initial OPPs per device with the OPP layer. This 55framework registers a set of initial OPPs per device with the OPP layer. This
59list is expected to be an optimally small number typically around 5 per device. 56list is expected to be an optimally small number typically around 5 per device.
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 8f9b66c4ac78..f7889f6a1353 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -100,7 +100,6 @@ config SOC_EXYNOS5440
100 default y 100 default y
101 depends on ARCH_EXYNOS5 101 depends on ARCH_EXYNOS5
102 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 102 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
103 select ARCH_HAS_OPP
104 select HAVE_ARM_ARCH_TIMER 103 select HAVE_ARM_ARCH_TIMER
105 select AUTO_ZRELADDR 104 select AUTO_ZRELADDR
106 select MIGHT_HAVE_PCI 105 select MIGHT_HAVE_PCI
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index a5960e2ac090..31aa866c3317 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -2,7 +2,6 @@ config ARCH_HIGHBANK
2 bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7 2 bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
3 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 3 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
4 select ARCH_HAS_HOLES_MEMORYMODEL 4 select ARCH_HAS_HOLES_MEMORYMODEL
5 select ARCH_HAS_OPP
6 select ARCH_SUPPORTS_BIG_ENDIAN 5 select ARCH_SUPPORTS_BIG_ENDIAN
7 select ARM_AMBA 6 select ARM_AMBA
8 select ARM_ERRATA_764369 if SMP 7 select ARM_ERRATA_764369 if SMP
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 4b5185748f74..ab6bcfd2e220 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,6 +1,5 @@
1menuconfig ARCH_MXC 1menuconfig ARCH_MXC
2 bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 2 bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
3 select ARCH_HAS_OPP
4 select ARCH_REQUIRE_GPIOLIB 3 select ARCH_REQUIRE_GPIOLIB
5 select ARM_CPU_SUSPEND if PM 4 select ARM_CPU_SUSPEND if PM
6 select CLKSRC_MMIO 5 select CLKSRC_MMIO
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 1c1ed737f7ab..e7189dcc9309 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -15,7 +15,6 @@ config ARCH_OMAP3
15 bool "TI OMAP3" 15 bool "TI OMAP3"
16 depends on ARCH_MULTI_V7 16 depends on ARCH_MULTI_V7
17 select ARCH_OMAP2PLUS 17 select ARCH_OMAP2PLUS
18 select ARCH_HAS_OPP
19 select ARM_CPU_SUSPEND if PM 18 select ARM_CPU_SUSPEND if PM
20 select OMAP_INTERCONNECT 19 select OMAP_INTERCONNECT
21 select PM_OPP if PM 20 select PM_OPP if PM
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 798073057e51..3a6e3c20a86d 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -85,7 +85,6 @@ config ARCH_R8A73A4
85 select CPU_V7 85 select CPU_V7
86 select SH_CLK_CPG 86 select SH_CLK_CPG
87 select RENESAS_IRQC 87 select RENESAS_IRQC
88 select ARCH_HAS_OPP
89 select SYS_SUPPORTS_SH_CMT 88 select SYS_SUPPORTS_SH_CMT
90 select SYS_SUPPORTS_SH_TMU 89 select SYS_SUPPORTS_SH_TMU
91 90
@@ -263,7 +262,6 @@ config MACH_KOELSCH
263config MACH_KZM9G 262config MACH_KZM9G
264 bool "KZM-A9-GT board" 263 bool "KZM-A9-GT board"
265 depends on ARCH_SH73A0 264 depends on ARCH_SH73A0
266 select ARCH_HAS_OPP
267 select ARCH_REQUIRE_GPIOLIB 265 select ARCH_REQUIRE_GPIOLIB
268 select REGULATOR_FIXED_VOLTAGE if REGULATOR 266 select REGULATOR_FIXED_VOLTAGE if REGULATOR
269 select SND_SOC_AK4642 if SND_SIMPLE_CARD 267 select SND_SOC_AK4642 if SND_SIMPLE_CARD
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index d8b9330f896a..1af70329b88d 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -64,7 +64,6 @@ config ARCH_VEXPRESS_DCSCB
64 64
65config ARCH_VEXPRESS_SPC 65config ARCH_VEXPRESS_SPC
66 bool "Versatile Express Serial Power Controller (SPC)" 66 bool "Versatile Express Serial Power Controller (SPC)"
67 select ARCH_HAS_OPP
68 select PM_OPP 67 select PM_OPP
69 help 68 help
70 The TC2 (A15x2 A7x3) versatile express core tile integrates a logic 69 The TC2 (A15x2 A7x3) versatile express core tile integrates a logic
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 0c164f81e72d..aaa5162c1509 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,6 +1,5 @@
1config ARCH_ZYNQ 1config ARCH_ZYNQ
2 bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7 2 bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
3 select ARCH_HAS_OPP
4 select ARCH_SUPPORTS_BIG_ENDIAN 3 select ARCH_SUPPORTS_BIG_ENDIAN
5 select ARM_AMBA 4 select ARM_AMBA
6 select ARM_GIC 5 select ARM_GIC
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index 49e74c1fc639..3dced0a9eae3 100644
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -68,7 +68,6 @@ comment "DEVFREQ Drivers"
68config ARM_EXYNOS4_BUS_DEVFREQ 68config ARM_EXYNOS4_BUS_DEVFREQ
69 bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" 69 bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
70 depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM 70 depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
71 select ARCH_HAS_OPP
72 select DEVFREQ_GOV_SIMPLE_ONDEMAND 71 select DEVFREQ_GOV_SIMPLE_ONDEMAND
73 select PM_OPP 72 select PM_OPP
74 help 73 help
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 9a83d780facd..e4e4121fa327 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -253,9 +253,6 @@ config APM_EMULATION
253 anything, try disabling/enabling this option (or disabling/enabling 253 anything, try disabling/enabling this option (or disabling/enabling
254 APM in your BIOS). 254 APM in your BIOS).
255 255
256config ARCH_HAS_OPP
257 bool
258
259config PM_OPP 256config PM_OPP
260 bool 257 bool
261 ---help--- 258 ---help---