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: Olof Johansson <olof@lixom.net>
Signed-off-by: Colin Cross <ccross@android.com>

2 files changed, 13 insertions, 4 deletions

diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c
index cda03f11550e..f02ba603ceb7 100644
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ b/arch/arm/mach-tegra/cpu-tegra.c
@@ -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);
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index ea07f513e90c..94793dd97aec 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -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 = {