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

Merge branch 'pm-cpufreq-assorted' into pm-cpufreq 

* pm-cpufreq-assorted: (21 commits)
  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: make __cpufreq_notify_transition() static
  cpufreq: Fix minor formatting issues
  cpufreq: Fix governor start/stop race condition
  cpufreq: Simplify userspace governor
  cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
  cpufreq: kirkwood: Select CPU_FREQ_TABLE option
  cpufreq: big.LITTLE needs cpufreq table
  cpufreq: SPEAr needs cpufreq table
  cpufreq: powerpc: Add cpufreq driver for Freescale e500mc SoCs
  cpufreq: remove unnecessary cpufreq_cpu_{get|put}() calls
  cpufreq: MAINTAINERS: Add git tree path for ARM specific updates
  cpufreq: rename index as driver_data in cpufreq_frequency_table
  cpufreq: Don't create empty /sys/devices/system/cpu/cpufreq directory
  cpufreq: Move get_cpu_idle_time() to cpufreq.c
  cpufreq: governors: Move get_governor_parent_kobj() to cpufreq.c
  cpufreq: Add EXPORT_SYMBOL_GPL for have_governor_per_policy
  ...
parents 7ae9b27b 7f77a563

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
@@ -2215,7 +2215,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/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-s3c24xx/cpufreq-utils.c

+1 −1
Original line number Diff line number Diff line
@@ -60,5 +60,5 @@ void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg) 
 */

void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg)

{

	__raw_writel(cfg->pll.index, S3C2410_MPLLCON);

	__raw_writel(cfg->pll.driver_data, S3C2410_MPLLCON);

}

arch/arm/mach-s3c24xx/cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void s3c_cpufreq_getcur(struct s3c_cpufreq_config *cfg) 
	cfg->freq.pclk = pclk = clk_get_rate(clk_pclk);

	cfg->freq.armclk = armclk = clk_get_rate(clk_arm);



	cfg->pll.index = __raw_readl(S3C2410_MPLLCON);

	cfg->pll.driver_data = __raw_readl(S3C2410_MPLLCON);

	cfg->pll.frequency = fclk;



	cfg->freq.hclk_tns = 1000000000 / (cfg->freq.hclk / 10);
@@ -431,7 +431,7 @@ static unsigned int suspend_freq; 
static int s3c_cpufreq_suspend(struct cpufreq_policy *policy)

{

	suspend_pll.frequency = clk_get_rate(_clk_mpll);

	suspend_pll.index = __raw_readl(S3C2410_MPLLCON);

	suspend_pll.driver_data = __raw_readl(S3C2410_MPLLCON);

	suspend_freq = s3c_cpufreq_get(0) * 1000;



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE