cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq

This patch moves cpufreq driver of powerpc platforms/cell to drivers/cpufreq.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 53aaefeb3386677ca46312a2b31dacac0c8c9493..9978f594cac013a5f94095846a4e98816784f2a7 100644 (file)
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -113,34 +113,10 @@ config CBE_THERM
        default m
        depends on CBE_RAS && SPU_BASE
 
-config CBE_CPUFREQ
-       tristate "CBE frequency scaling"
-       depends on CBE_RAS && CPU_FREQ
-       default m
-       help
-         This adds the cpufreq driver for Cell BE processors.
-         For details, take a look at <file:Documentation/cpu-freq/>.
-         If you don't have such processor, say N
-
-config CBE_CPUFREQ_PMI_ENABLE
-       bool "CBE frequency scaling using PMI interface"
-       depends on CBE_CPUFREQ
-       default n
-       help
-         Select this, if you want to use the PMI interface
-         to switch frequencies. Using PMI, the
-         processor will not only be able to run at lower speed,
-         but also at lower core voltage.
-
-config CBE_CPUFREQ_PMI
-       tristate
-       depends on CBE_CPUFREQ_PMI_ENABLE
-       default CBE_CPUFREQ
-
 config PPC_PMI
        tristate
        default y
-       depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON
+       depends on CPU_FREQ_CBE_PMI || PPC_IBM_CELL_POWERBUTTON
        help
          PMI (Platform Management Interrupt) is a way to
          communicate with the BMC (Baseboard Management Controller).

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index a4a89350bcfceb9ed8aa40f5bd92a0bea1c4b5e4..fe053e7c73ee95ae21dc618232c19190930c309a 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -5,9 +5,6 @@ obj-$(CONFIG_PPC_CELL_NATIVE)           += iommu.o setup.o spider-pic.o \
 obj-$(CONFIG_CBE_RAS)                  += ras.o
 
 obj-$(CONFIG_CBE_THERM)                        += cbe_thermal.o
-obj-$(CONFIG_CBE_CPUFREQ_PMI)          += cbe_cpufreq_pmi.o
-obj-$(CONFIG_CBE_CPUFREQ)              += cbe-cpufreq.o
-cbe-cpufreq-y                          += cbe_cpufreq_pervasive.o cbe_cpufreq.o
 obj-$(CONFIG_CBE_CPUFREQ_SPU_GOVERNOR) += cpufreq_spudemand.o
 
 obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o

diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc
index e76992f7968323749e1eb53fcb7120d0a9ae9f49..9c926ca0d718020b048b1efc09b0b55c7b1efe2f 100644 (file)
--- a/drivers/cpufreq/Kconfig.powerpc
+++ b/drivers/cpufreq/Kconfig.powerpc
@@ -1,3 +1,21 @@
+config CPU_FREQ_CBE
+       tristate "CBE frequency scaling"
+       depends on CBE_RAS && PPC_CELL
+       default m
+       help
+         This adds the cpufreq driver for Cell BE processors.
+         For details, take a look at <file:Documentation/cpu-freq/>.
+         If you don't have such processor, say N
+
+config CPU_FREQ_CBE_PMI
+       bool "CBE frequency scaling using PMI interface"
+       depends on CPU_FREQ_CBE
+       default n
+       help
+         Select this, if you want to use the PMI interface to switch
+         frequencies. Using PMI, the processor will not only be able to run at
+         lower speed, but also at lower core voltage.
+
 config CPU_FREQ_MAPLE
        bool "Support for Maple 970FX Evaluation Board"
        depends on PPC_MAPLE

diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 3a9ff23ff9d976d2b51198c1e4b733e59050be68..17417c7ee135107289e39cefc2a8ba2860490ab4 100644 (file)
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -73,6 +73,9 @@ obj-$(CONFIG_ARCH_TEGRA)              += tegra-cpufreq.o
 
 ##################################################################################
 # PowerPC platform drivers
+obj-$(CONFIG_CPU_FREQ_CBE)             += ppc-cbe-cpufreq.o
+ppc-cbe-cpufreq-y                      += ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o
+obj-$(CONFIG_CPU_FREQ_CBE_PMI)         += ppc_cbe_cpufreq_pmi.o
 obj-$(CONFIG_CPU_FREQ_MAPLE)           += maple-cpufreq.o
 
 ##################################################################################

diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
similarity index 99%
rename from arch/powerpc/platforms/cell/cbe_cpufreq.c
rename to drivers/cpufreq/ppc_cbe_cpufreq.c
index 718c6a33023d56715e81e187b3ffb8d53e7df0a5..e577a1dbbfcd572be200a7a73f81728959bb24b5 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -27,7 +27,8 @@
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/cell-regs.h>
-#include "cbe_cpufreq.h"
+
+#include "ppc_cbe_cpufreq.h"
 
 static DEFINE_MUTEX(cbe_switch_mutex);
 

diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.h b/drivers/cpufreq/ppc_cbe_cpufreq.h
similarity index 82%
rename from arch/powerpc/platforms/cell/cbe_cpufreq.h
rename to drivers/cpufreq/ppc_cbe_cpufreq.h
index c1d86bfa92ff9b1711dce8759f9225ed370597ad..b4c00a5a6a597a94035b9c7cdb0652c0513edf63 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.h
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.h
@@ -1,5 +1,5 @@
 /*
- * cbe_cpufreq.h
+ * ppc_cbe_cpufreq.h
  *
  * This file contains the definitions used by the cbe_cpufreq driver.
  *
@@ -17,7 +17,7 @@ int cbe_cpufreq_get_pmode(int cpu);
 
 int cbe_cpufreq_set_pmode_pmi(int cpu, unsigned int pmode);
 
-#if defined(CONFIG_CBE_CPUFREQ_PMI) || defined(CONFIG_CBE_CPUFREQ_PMI_MODULE)
+#if defined(CONFIG_CPU_FREQ_CBE_PMI) || defined(CONFIG_CPU_FREQ_CBE_PMI_MODULE)
 extern bool cbe_cpufreq_has_pmi;
 #else
 #define cbe_cpufreq_has_pmi (0)

diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c b/drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
similarity index 99%
rename from arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
rename to drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
index 20472e487b6f713f5cd6018420005e519ec3b3ba..84d2f2cf5ba7f4d1e7a34771cf6f79815cb9961d 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
@@ -30,7 +30,7 @@
 #include <asm/hw_irq.h>
 #include <asm/cell-regs.h>
 
-#include "cbe_cpufreq.h"
+#include "ppc_cbe_cpufreq.h"
 
 /* to write to MIC register */
 static u64 MIC_Slow_Fast_Timer_table[] = {

diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
similarity index 99%
rename from arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
rename to drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
index 60a07a4f9326afb7c8f538de2c45040dbe124d4b..d29e8da396a040013bece00cb2ac1c1b1d587137 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
@@ -35,7 +35,7 @@
 #include <asm/time.h>
 #endif
 
-#include "cbe_cpufreq.h"
+#include "ppc_cbe_cpufreq.h"
 
 static u8 pmi_slow_mode_limit[MAX_CBE];