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

Commit 67f699eb authored by Viresh Kumar's avatar Viresh Kumar Committed by Junjie Wu
Browse files

cpufreq: remove CONFIG_CPU_FREQ_TABLE 



CONFIG_CPU_FREQ_TABLE will be always enabled when cpufreq framework is used, as
cpufreq core depends on it. So, we don't need this CONFIG option anymore as it
is not configurable. Remove CONFIG_CPU_FREQ_TABLE and update its users.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Git-commit: 3bc28ab6da039f8020bbcea8e832b63a900bdb66
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[junjiew@codeaurora.org: resolved merge conflicts for Kconfig.arm and
 Kconfig.powerpc by ignoring missing configs. Searched and removed
 CPU_FREQ_TABLE config in our tree (arch/arm/mach-tegra/Kconfig,
 arch/powerpc/platforms/Kconfig, Documentation/android.txt). These conflicts
 are generated because we don't pull Kconfig changes for archs we don't use.]
Signed-off-by: default avatarJunjie Wu <junjiew@codeaurora.org>
parent 45b1c5e5

Documentation/android.txt

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ DEBUG_SPINLOCK_SLEEP 
DEBUG_INFO

FRAME_POINTER

CPU_FREQ

CPU_FREQ_TABLE

CPU_FREQ_DEFAULT_GOV_ONDEMAND

CPU_FREQ_GOV_ONDEMAND

CRC_CCITT

arch/arm/mach-tegra/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ config ARCH_TEGRA_2x_SOC 
	select ARM_ERRATA_754327 if SMP

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CPU_FREQ_TABLE if CPU_FREQ

	select CPU_V7

	select PINCTRL

	select PINCTRL_TEGRA20
@@ -46,7 +45,6 @@ config ARCH_TEGRA_3x_SOC 
	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CPU_FREQ_TABLE if CPU_FREQ

	select CPU_V7

	select PINCTRL

	select PINCTRL_TEGRA30
@@ -63,7 +61,6 @@ config ARCH_TEGRA_114_SOC 
	select ARM_ARCH_TIMER

	select ARM_GIC

	select ARM_L1_CACHE_SHIFT_6

	select CPU_FREQ_TABLE if CPU_FREQ

	select CPU_V7

	select PINCTRL

	select PINCTRL_TEGRA114

arch/arm/mach-ux500/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ config UX500_SOC_COMMON 


config UX500_SOC_DB8500

	bool

	select CPU_FREQ_TABLE if CPU_FREQ

	select MFD_DB8500_PRCMU

	select PINCTRL_DB8500

	select PINCTRL_DB8540

arch/blackfin/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,6 @@ source "drivers/cpufreq/Kconfig" 
config BFIN_CPU_FREQ

	bool

	depends on CPU_FREQ

	select CPU_FREQ_TABLE

	default y



config CPU_VOLTAGE

arch/powerpc/platforms/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ menu "CPU Frequency drivers" 
config CPU_FREQ_PMAC

	bool "Support for Apple PowerBooks"

	depends on ADB_PMU && PPC32

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple PowerBooks,

	  this currently includes some models of iBook & Titanium
@@ -208,7 +207,6 @@ config CPU_FREQ_PMAC 
config CPU_FREQ_PMAC64

	bool "Support for some Apple G5s"

	depends on PPC_PMAC && PPC64

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple iMac G5,

	  and some of the more recent desktop G5 machines as well.
@@ -217,7 +215,6 @@ config PPC_PASEMI_CPUFREQ 
	bool "Support for PA Semi PWRficient"

	depends on PPC_PASEMI

	default y

	select CPU_FREQ_TABLE

	help

	  This adds the support for frequency switching on PA Semi

	  PWRficient processors.