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

Commit 7ae9b27b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq-Kconfig' into pm-cpufreq 

* pm-cpufreq-Kconfig:
  cpufreq: X86_AMD_FREQ_SENSITIVITY: select CPU_FREQ_TABLE
  cpufreq: tegra: create CONFIG_ARM_TEGRA_CPUFREQ
  cpufreq: S3C2416/S3C64XX: select CPU_FREQ_TABLE
  cpufreq: pxa: select CPU_FREQ_TABLE
  cpufreq: powerpc: CBE_RAS: select CPU_FREQ_TABLE
  cpufreq: imx: select CPU_FREQ_TABLE
  cpufreq: highbank: remove select CPU_FREQ_TABLE
  cpufreq: exynos: select CPU_FREQ_TABLE
  cpufreq: davinci: select CPU_FREQ_TABLE
  cpufreq: cris: select CPU_FREQ_TABLE
  cpufreq: blackfin: enable driver for CONFIG_BFIN_CPU_FREQ
parents 9e895ace ac121e9b

arch/arm/mach-davinci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config ARCH_DAVINCI_DA850 
	bool "DA850/OMAP-L138/AM18x based system"

	select ARCH_DAVINCI_DA8XX

	select ARCH_HAS_CPUFREQ

	select CPU_FREQ_TABLE

	select CP_INTC



config ARCH_DAVINCI_DA8XX

arch/arm/mach-pxa/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -615,12 +615,14 @@ endmenu 
config PXA25x

	bool

	select CPU_XSCALE

	select CPU_FREQ_TABLE if CPU_FREQ

	help

	  Select code specific to PXA21x/25x/26x variants



config PXA27x

	bool

	select CPU_XSCALE

	select CPU_FREQ_TABLE if CPU_FREQ

	help

	  Select code specific to PXA27x variants
@@ -633,6 +635,7 @@ config CPU_PXA26x 
config PXA3xx

	bool

	select CPU_XSC3

	select CPU_FREQ_TABLE if CPU_FREQ

	help

	  Select code specific to PXA3xx variants

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/cris/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -134,11 +134,13 @@ config SVINTO_SIM 


config ETRAXFS

	bool "ETRAX-FS-V32"

	select CPU_FREQ_TABLE if CPU_FREQ

	help

	  Support CRIS V32.



config CRIS_MACH_ARTPEC3

        bool "ARTPEC-3"

	select CPU_FREQ_TABLE if CPU_FREQ

        help

          Support Axis ARTPEC-3.

drivers/cpufreq/Kconfig.arm

+13 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ config ARM_DT_BL_CPUFREQ 
config ARM_EXYNOS_CPUFREQ

	bool "SAMSUNG EXYNOS SoCs"

	depends on ARCH_EXYNOS

	select CPU_FREQ_TABLE

	default y

	help

	  This adds the CPUFreq driver common part for Samsung
@@ -46,6 +47,7 @@ config ARM_EXYNOS5250_CPUFREQ 
config ARM_EXYNOS5440_CPUFREQ

	def_bool SOC_EXYNOS5440

	depends on HAVE_CLK && PM_OPP && OF

	select CPU_FREQ_TABLE

	help

	  This adds the CPUFreq driver for Samsung EXYNOS5440

	  SoC. The nature of exynos5440 clock controller is
@@ -55,7 +57,6 @@ config ARM_EXYNOS5440_CPUFREQ 
config ARM_HIGHBANK_CPUFREQ

	tristate "Calxeda Highbank-based"

	depends on ARCH_HIGHBANK

	select CPU_FREQ_TABLE

	select GENERIC_CPUFREQ_CPU0

	select PM_OPP

	select REGULATOR
@@ -71,6 +72,7 @@ config ARM_IMX6Q_CPUFREQ 
	tristate "Freescale i.MX6Q cpufreq support"

	depends on SOC_IMX6Q

	depends on REGULATOR_ANATOP

	select CPU_FREQ_TABLE

	help

	  This adds cpufreq driver support for Freescale i.MX6Q SOC.
@@ -99,6 +101,7 @@ config ARM_OMAP2PLUS_CPUFREQ 
config ARM_S3C2416_CPUFREQ

	bool "S3C2416 CPU Frequency scaling support"

	depends on CPU_S3C2416

	select CPU_FREQ_TABLE

	help

	  This adds the CPUFreq driver for the Samsung S3C2416 and

	  S3C2450 SoC. The S3C2416 supports changing the rate of the
@@ -121,6 +124,7 @@ config ARM_S3C2416_CPUFREQ_VCORESCALE 
config ARM_S3C64XX_CPUFREQ

	bool "Samsung S3C64XX"

	depends on CPU_S3C6410

	select CPU_FREQ_TABLE

	default y

	help

	  This adds the CPUFreq driver for Samsung S3C6410 SoC.
@@ -150,3 +154,11 @@ config ARM_SPEAR_CPUFREQ 
	default y

	help

	  This adds the CPUFreq driver support for SPEAr SOCs.



config ARM_TEGRA_CPUFREQ

	bool "TEGRA CPUFreq support"

	depends on ARCH_TEGRA

	select CPU_FREQ_TABLE

	default y

	help

	  This adds the CPUFreq driver support for TEGRA SOCs.