Merge tag 'ntb-3.12' of git://github.com/jonmason/ntb

[cascardo/linux.git] / drivers / cpufreq / imx6q-cpufreq.c

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index e37cdae..3e39654 100644 (file)
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -117,28 +117,11 @@ static int imx6q_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 */
@@ -221,14 +204,12 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
 
        cpu_dev = &pdev->dev;
 
-       np = of_find_node_by_path("/cpus/cpu@0");
+       np = of_node_get(cpu_dev->of_node);
        if (!np) {
                dev_err(cpu_dev, "failed to find cpu0 node\n");
                return -ENOENT;
        }
 
-       cpu_dev->of_node = np;
-
        arm_clk = devm_clk_get(cpu_dev, "arm");
        pll1_sys_clk = devm_clk_get(cpu_dev, "pll1_sys");
        pll1_sw_clk = devm_clk_get(cpu_dev, "pll1_sw");