Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fafb4e7 authored by Octavian Purdila's avatar Octavian Purdila Committed by Rafael J. Wysocki
Browse files

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: default avatarOctavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a0df7734

drivers/cpufreq/imx6q-cpufreq.c

+4 −2
Original line number Diff line number Diff line
@@ -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

	 *  - 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,

		 * CPU may run at higher than 528MHz, this will lead to
@@ -215,7 +216,8 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
		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");

		secondary_sel_clk = clk_get(cpu_dev, "secondary_sel");

		if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) {