提交 3fafb4e7 编写于 作者: O Octavian Purdila 提交者: Rafael J. Wysocki

cpufreq: imx6q: imx6ull should use the same flow as imx6ul

This fixes an issue with imx6ull where setting the frequency to 528Mhz
would actually set the ARM clock to 324Mhz.
Signed-off-by: NOctavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: NLeonard Crestez <leonard.crestez@nxp.com>
Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: NFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 a0df7734
...@@ -101,7 +101,8 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) ...@@ -101,7 +101,8 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index)
* - Reprogram pll1_sys_clk and reparent pll1_sw_clk back to it * - Reprogram pll1_sys_clk and reparent pll1_sw_clk back to it
* - Disable pll2_pfd2_396m_clk * - Disable pll2_pfd2_396m_clk
*/ */
if (of_machine_is_compatible("fsl,imx6ul")) { if (of_machine_is_compatible("fsl,imx6ul") ||
of_machine_is_compatible("fsl,imx6ull")) {
/* /*
* When changing pll1_sw_clk's parent to pll1_sys_clk, * When changing pll1_sw_clk's parent to pll1_sys_clk,
* CPU may run at higher than 528MHz, this will lead to * CPU may run at higher than 528MHz, this will lead to
...@@ -215,7 +216,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) ...@@ -215,7 +216,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
goto put_clk; goto put_clk;
} }
if (of_machine_is_compatible("fsl,imx6ul")) { if (of_machine_is_compatible("fsl,imx6ul") ||
of_machine_is_compatible("fsl,imx6ull")) {
pll2_bus_clk = clk_get(cpu_dev, "pll2_bus"); pll2_bus_clk = clk_get(cpu_dev, "pll2_bus");
secondary_sel_clk = clk_get(cpu_dev, "secondary_sel"); secondary_sel_clk = clk_get(cpu_dev, "secondary_sel");
if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) { if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册