Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Octavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Octavian Purdila and committed by
Rafael J. Wysocki
3fafb4e7 a0df7734

+4 -2
+4 -2
drivers/cpufreq/imx6q-cpufreq.c
··· 101 101 * - Reprogram pll1_sys_clk and reparent pll1_sw_clk back to it 102 102 * - Disable pll2_pfd2_396m_clk 103 103 */ 104 - if (of_machine_is_compatible("fsl,imx6ul")) { 104 + if (of_machine_is_compatible("fsl,imx6ul") || 105 + of_machine_is_compatible("fsl,imx6ull")) { 105 106 /* 106 107 * When changing pll1_sw_clk's parent to pll1_sys_clk, 107 108 * CPU may run at higher than 528MHz, this will lead to ··· 216 215 goto put_clk; 217 216 } 218 217 219 - if (of_machine_is_compatible("fsl,imx6ul")) { 218 + if (of_machine_is_compatible("fsl,imx6ul") || 219 + of_machine_is_compatible("fsl,imx6ull")) { 220 220 pll2_bus_clk = clk_get(cpu_dev, "pll2_bus"); 221 221 secondary_sel_clk = clk_get(cpu_dev, "secondary_sel"); 222 222 if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) {