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

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (21 commits)
  cpufreq: ondemand: update sampling rate only on right CPUs
  cpufreq: SPEAr: Add CPUFreq driver
  cpufreq: governors: Fix jiffies/cputime mixup (revisited)
  cpufreq: ondemand: fix wrong delay sampling rate
  cpufreq: exynos: Use static for functions used in only this file
  cpufreq: exynos: Broadcast frequency change notifications for all cores
  cpufreq: remove use of __devexit
  cpufreq: remove use of __devinit
  cpufreq: remove use of __devexit_p
  cpufreq: Remove unnecessary initialization of a local variable
  cpufreq: Make sure target freq is within limits
  cpufreq: Avoid calling cpufreq driver's target() routine if target_freq == policy->cur
  cpufreq: Fix sparse warning by making local function static
  cpufreq: Fix sparse warnings by updating cputime64_t to u64
  cpufreq: governors: remove redundant code
  cpufreq: return early from __cpufreq_driver_getavg()
  cpufreq: fix jiffies/cputime mixup in conservative/ondemand governors
  cpufreq: Improve debug prints
  cpufreq: Move common part from governors to separate file, v2
  cpufreq / core: Fix printing of governor and driver name
  ...
parents d4c091f1 3e33ee9e

Documentation/devicetree/bindings/cpufreq/cpufreq-spear.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
SPEAr cpufreq driver

-------------------



SPEAr SoC cpufreq driver for CPU frequency scaling.

It supports both uniprocessor (UP) and symmetric multiprocessor (SMP) systems

which share clock across all CPUs.



Required properties:

- cpufreq_tbl: Table of frequencies CPU could be transitioned into, in the

  increasing order.



Optional properties:

- clock-latency: Specify the possible maximum transition latency for clock, in

  unit of nanoseconds.



Both required and optional properties listed above must be defined under node

/cpus/cpu@0.



Examples:

--------

cpus {



	<...>



	cpu@0 {

		compatible = "arm,cortex-a9";

		reg = <0>;



		<...>



		cpufreq_tbl = < 166000

				200000

				250000

				300000

				400000

				500000

				600000 >;

	};



	<...>



};

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -904,6 +904,7 @@ config ARCH_NOMADIK 


config PLAT_SPEAR

	bool "ST SPEAr"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

drivers/cpufreq/Kconfig.arm

+7 −0
Original line number Diff line number Diff line
@@ -76,3 +76,10 @@ config ARM_EXYNOS5250_CPUFREQ 
	help

	  This adds the CPUFreq driver for Samsung EXYNOS5250

	  SoC.



config ARM_SPEAR_CPUFREQ

	bool "SPEAr CPUFreq support"

	depends on PLAT_SPEAR

	default y

	help

	  This adds the CPUFreq driver support for SPEAr SOCs.

drivers/cpufreq/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o 
obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE)	+= cpufreq_performance.o

obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE)	+= cpufreq_powersave.o

obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE)	+= cpufreq_userspace.o

obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND)	+= cpufreq_ondemand.o

obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE)	+= cpufreq_conservative.o

obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND)	+= cpufreq_ondemand.o cpufreq_governor.o

obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE)	+= cpufreq_conservative.o cpufreq_governor.o



# CPUfreq cross-arch helpers

obj-$(CONFIG_CPU_FREQ_TABLE)		+= freq_table.o
@@ -50,6 +50,7 @@ obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o 
obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)	+= exynos4x12-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o

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

obj-$(CONFIG_ARM_SPEAR_CPUFREQ)		+= spear-cpufreq.o



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

# PowerPC platform drivers

drivers/cpufreq/cpufreq-cpu0.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static struct cpufreq_driver cpu0_cpufreq_driver = { 
	.attr = cpu0_cpufreq_attr,

};



static int __devinit cpu0_cpufreq_driver_init(void)

static int cpu0_cpufreq_driver_init(void)

{

	struct device_node *np;

	int ret;