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

Commit 89a5fb84 authored by Colin Cross's avatar Colin Cross
Browse files

ARM: tegra: cpufreq: Take an extra reference to pllx 



During cpu frequency changes, take an extra reference to pllx so
that it doesn't turn off and on while the cpu is temporarily on
pllp.  If the cpu is moved to pllp permanently, pllx will be
turned off.

Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarColin Cross <ccross@android.com>
parent 4729fd7a

arch/arm/mach-tegra/cpu-tegra.c

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ static int tegra_cpu_init(struct cpufreq_policy *policy) 
	if (IS_ERR(cpu_clk))

		return PTR_ERR(cpu_clk);



	clk_enable(cpu_clk);



	cpufreq_frequency_table_cpuinfo(policy, freq_table);

	cpufreq_frequency_table_get_attr(freq_table, policy->cpu);

	policy->cur = tegra_getspeed(policy->cpu);

arch/arm/mach-tegra/tegra2_clocks.c

+11 −4
Original line number Diff line number Diff line
@@ -385,10 +385,16 @@ static void tegra2_cpu_clk_disable(struct clk *c) 
static int tegra2_cpu_clk_set_rate(struct clk *c, unsigned long rate)

{

	int ret;

	/*

	 * Take an extra reference to the main pll so it doesn't turn

	 * off when we move the cpu off of it

	 */

	clk_enable(c->u.cpu.main);



	ret = clk_set_parent(c->parent, c->u.cpu.backup);

	if (ret) {

		pr_err("Failed to switch cpu to clock %s\n", c->u.cpu.backup->name);

		return ret;

		goto out;

	}



	if (rate == clk_get_rate(c->u.cpu.backup))
@@ -397,17 +403,18 @@ static int tegra2_cpu_clk_set_rate(struct clk *c, unsigned long rate) 
	ret = clk_set_rate(c->u.cpu.main, rate);

	if (ret) {

		pr_err("Failed to change cpu pll to %lu\n", rate);

		return ret;

		goto out;

	}



	ret = clk_set_parent(c->parent, c->u.cpu.main);

	if (ret) {

		pr_err("Failed to switch cpu to clock %s\n", c->u.cpu.main->name);

		return ret;

		goto out;

	}



out:

	return 0;

	clk_disable(c->u.cpu.main);

	return ret;

}



static struct clk_ops tegra_cpu_ops = {