cpufreq: imx6q: Fix clock enable balance

For changing the cpu frequency the i.MX6q has to be switched to some
intermediate clock during the PLL reprogramming. The driver tries
to be clever to keep the enable count correct but gets it wrong. If
the cpufreq is increased it calls clk_disable_unprepare twice
on pll2_pfd2_396m. This puts all other devices which get their clock
from pll2_pfd2_396m into a nonworking state.

Fix this by removing the clk enabling/disabling altogether since the
clk core will do this automatically during a reparent.

[shawn.guo: The driver assumes that cpu always boots with 800MHz, and
 the first transition on 400MHz must be entering 400MHz setpoint.  But
 it turns out that's not always the case.  In some system, cpu boots up
 at 400MHz and then the first transition on 400MHz will be leaving
 400MHz setpoint rather than entering.  In this case, the use count of
 pll2_pfd2_396m will be wrong.  Anyway, since clock framework has been
 nicely handling the clk enabling during reparent, we should not need
 to worry about it.]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

1 files changed, 0 insertions, 17 deletions

diff --git a/drivers/cpufreq/cpufreq-imx6.c b/drivers/cpufreq/cpufreq-imx6.c
index 24dfa7a4b1f7..51861d668ee3 100644
--- a/drivers/cpufreq/cpufreq-imx6.c
+++ b/drivers/cpufreq/cpufreq-imx6.c
@@ -156,28 +156,11 @@ static int imx6_set_target(struct cpufreq_policy *policy,
          *  - Reprogram pll1_sys_clk and reparent pll1_sw_clk back to it
          *  - Disable pll2_pfd2_396m_clk
          */
-        clk_prepare_enable(pll2_pfd2_396m_clk);
         clk_set_parent(step_clk, pll2_pfd2_396m_clk);
         clk_set_parent(pll1_sw_clk, step_clk);
         if (freq_hz > clk_get_rate(pll2_pfd2_396m_clk)) {
                 clk_set_rate(pll1_sys_clk, freqs.new * 1000);
-                /*
-                 * If we are leaving 396 MHz set-point, we need to enable
-                 * pll1_sys_clk and disable pll2_pfd2_396m_clk to keep
-                 * their use count correct.
-                 */
-                if (freqs.old * 1000 <= clk_get_rate(pll2_pfd2_396m_clk)) {
-                        clk_prepare_enable(pll1_sys_clk);
-                        clk_disable_unprepare(pll2_pfd2_396m_clk);
-                }
                 clk_set_parent(pll1_sw_clk, pll1_sys_clk);
-                clk_disable_unprepare(pll2_pfd2_396m_clk);
-        } else {
-                /*
-                 * Disable pll1_sys_clk if pll2_pfd2_396m_clk is sufficient
-                 * to provide the frequency.
-                 */
-                clk_disable_unprepare(pll1_sys_clk);
         }
 
         /* Ensure the arm clock divider is what we expect */