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

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

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (41 commits)
  cpufreq: tegra: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c64xx: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: omap: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: imx6q: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: davinci: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: arm-big-little: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: e_powersaver: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: ACPI: call CPUFREQ_POSTCHANGE notfier in error cases
  cpufreq: s3c2416: fix forgotten driver_data conversions
  cpufreq: make __cpufreq_notify_transition() static
  cpufreq: Fix minor formatting issues
  cpufreq: Fix governor start/stop race condition
  cpufreq: Simplify userspace governor
  cpufreq: X86_AMD_FREQ_SENSITIVITY: select CPU_FREQ_TABLE
  cpufreq: tegra: create CONFIG_ARM_TEGRA_CPUFREQ
  cpufreq: S3C2416/S3C64XX: select CPU_FREQ_TABLE
  ...
parents 52388492 e11158c0

Documentation/cpu-freq/cpu-drivers.txt

+2 −8
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ As most cpufreq processors only allow for being set to a few specific 
frequencies, a "frequency table" with some functions might assist in

some work of the processor driver. Such a "frequency table" consists

of an array of struct cpufreq_frequency_table entries, with any value in

"index" you want to use, and the corresponding frequency in

"driver_data" you want to use, and the corresponding frequency in

"frequency". At the end of the table, you need to add a

cpufreq_frequency_table entry with frequency set to CPUFREQ_TABLE_END. And

if you want to skip one entry in the table, set the frequency to
@@ -214,10 +214,4 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy, 
is the corresponding frequency table helper for the ->target

stage. Just pass the values to this function, and the unsigned int

index returns the number of the frequency table entry which contains

the frequency the CPU shall be set to. PLEASE NOTE: This is not the

"index" which is in this cpufreq_table_entry.index, but instead

cpufreq_table[index]. So, the new frequency is

cpufreq_table[index].frequency, and the value you stored into the

frequency table "index" field is

cpufreq_table[index].index.

the frequency the CPU shall be set to.

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2218,7 +2218,8 @@ M: Viresh Kumar <viresh.kumar@linaro.org> 
L:	cpufreq@vger.kernel.org

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

T:	git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)

F:	drivers/cpufreq/

F:	include/linux/cpufreq.h

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-davinci/da850.c

+4 −4
Original line number Diff line number Diff line
@@ -1004,7 +1004,7 @@ static const struct da850_opp da850_opp_96 = { 


#define OPP(freq) 		\

	{				\

		.index = (unsigned int) &da850_opp_##freq,	\

		.driver_data = (unsigned int) &da850_opp_##freq,	\

		.frequency = freq * 1000, \

	}
@@ -1016,7 +1016,7 @@ static struct cpufreq_frequency_table da850_freq_table[] = { 
	OPP(200),

	OPP(96),

	{

		.index		= 0,

		.driver_data		= 0,

		.frequency	= CPUFREQ_TABLE_END,

	},

};
@@ -1044,7 +1044,7 @@ static int da850_set_voltage(unsigned int index) 
	if (!cvdd)

		return -ENODEV;



	opp = (struct da850_opp *) cpufreq_info.freq_table[index].index;

	opp = (struct da850_opp *) cpufreq_info.freq_table[index].driver_data;



	return regulator_set_voltage(cvdd, opp->cvdd_min, opp->cvdd_max);

}
@@ -1125,7 +1125,7 @@ static int da850_set_pll0rate(struct clk *clk, unsigned long index) 
	struct pll_data *pll = clk->pll_data;

	int ret;



	opp = (struct da850_opp *) cpufreq_info.freq_table[index].index;

	opp = (struct da850_opp *) cpufreq_info.freq_table[index].driver_data;

	prediv = opp->prediv;

	mult = opp->mult;

	postdiv = opp->postdiv;

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