Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eb1c377 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 764295ae

arch/powerpc/platforms/cell/Kconfig

+1 −25
Original line number Original line Diff line number Diff line
@@ -113,34 +113,10 @@ config CBE_THERM 
	default m

	default m

	depends on CBE_RAS && SPU_BASE

	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

config PPC_PMI

	tristate

	tristate

	default y

	default y

	depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON

	depends on CPU_FREQ_CBE_PMI || PPC_IBM_CELL_POWERBUTTON

	help

	help

	  PMI (Platform Management Interrupt) is a way to

	  PMI (Platform Management Interrupt) is a way to

	  communicate with the BMC (Baseboard Management Controller).

	  communicate with the BMC (Baseboard Management Controller).

arch/powerpc/platforms/cell/Makefile

+0 −3
Original line number Original line Diff line number Diff line
@@ -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_RAS)			+= ras.o





obj-$(CONFIG_CBE_THERM)			+= cbe_thermal.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_CBE_CPUFREQ_SPU_GOVERNOR)	+= cpufreq_spudemand.o





obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON)	+= cbe_powerbutton.o

obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON)	+= cbe_powerbutton.o

drivers/cpufreq/Kconfig.powerpc

+18 −0
Original line number Original line Diff line number Diff line 
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

config CPU_FREQ_MAPLE

	bool "Support for Maple 970FX Evaluation Board"

	bool "Support for Maple 970FX Evaluation Board"

	depends on PPC_MAPLE

	depends on PPC_MAPLE

drivers/cpufreq/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,9 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o 




##################################################################################

##################################################################################

# PowerPC platform drivers

# 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

obj-$(CONFIG_CPU_FREQ_MAPLE)		+= maple-cpufreq.o





##################################################################################

##################################################################################

arch/powerpc/platforms/cell/cbe_cpufreq.c→drivers/cpufreq/ppc_cbe_cpufreq.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,8 @@ 
#include <asm/machdep.h>

#include <asm/machdep.h>

#include <asm/prom.h>

#include <asm/prom.h>

#include <asm/cell-regs.h>

#include <asm/cell-regs.h>

#include "cbe_cpufreq.h"



#include "ppc_cbe_cpufreq.h"





static DEFINE_MUTEX(cbe_switch_mutex);

static DEFINE_MUTEX(cbe_switch_mutex);