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

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

cpufreq: integrator: move cpufreq driver to drivers/cpufreq 



This patch moves cpufreq driver of ARM based integrator platform to
drivers/cpufreq.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cffc96eb

arch/arm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -2166,17 +2166,6 @@ config CPU_FREQ_SA1100 
config CPU_FREQ_SA1110

	bool



config CPU_FREQ_INTEGRATOR

	tristate "CPUfreq driver for ARM Integrator CPUs"

	depends on ARCH_INTEGRATOR && CPU_FREQ

	default y

	help

	  This enables the CPUfreq driver for ARM Integrator CPUs.



	  For details, take a look at <file:Documentation/cpu-freq>.



	  If in doubt, say Y.



config CPU_FREQ_S3C

	bool

	help

arch/arm/mach-integrator/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,5 +9,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o 
obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o



obj-$(CONFIG_PCI)			+= pci_v3.o pci.o

obj-$(CONFIG_CPU_FREQ_INTEGRATOR)	+= cpu.o

obj-$(CONFIG_INTEGRATOR_IMPD1)		+= impd1.o

drivers/cpufreq/Kconfig.arm

+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,14 @@ config ARM_IMX6Q_CPUFREQ 


	  If in doubt, say N.



config ARM_INTEGRATOR

	tristate "CPUfreq driver for ARM Integrator CPUs"

	depends on ARCH_INTEGRATOR

	default y

	help

	  This enables the CPUfreq driver for ARM Integrator CPUs.

	  If in doubt, say Y.



config ARM_KIRKWOOD_CPUFREQ

	def_bool ARCH_KIRKWOOD && OF

	help

drivers/cpufreq/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o 
obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o

obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)	+= highbank-cpufreq.o

obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)		+= imx6q-cpufreq.o

obj-$(CONFIG_ARM_INTEGRATOR)		+= integrator-cpufreq.o

obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ)	+= kirkwood-cpufreq.o

obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)	+= omap-cpufreq.o

obj-$(CONFIG_PXA25x)			+= pxa2xx-cpufreq.o

arch/arm/mach-integrator/cpu.c→drivers/cpufreq/integrator-cpufreq.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-integrator/cpu.c

 *

 *  Copyright (C) 2001-2002 Deep Blue Solutions Ltd.

 *

 * This program is free software; you can redistribute it and/or modify