diff mbox

cpufreq: imx6: Fix the secondary_sel_clk clock string

Message ID 1463713188-6896-1-git-send-email-festevam@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Fabio Estevam May 20, 2016, 2:59 a.m. UTC 
From: Fabio Estevam <fabio.estevam@nxp.com>

Commit a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to
support imx6ul") introduced the 'secondary_sel_clk' clock, which is
specific for the i.mx6ul case, but used the wrong clock string inside 
the clk_get() function.

Use the correct clock string: "secondary_sel_clk".

This fixes a kernel crash after running the 'reboot' command on a
mx6ul.

Fixes: a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to support imx6ul")
Cc: <stable@vger.kernel.org> # 4.4.x
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/cpufreq/imx6q-cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Viresh Kumar May 20, 2016, 3:03 a.m. UTC | #1 
On 19-05-16, 23:59, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Commit a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to
> support imx6ul") introduced the 'secondary_sel_clk' clock, which is
> specific for the i.mx6ul case, but used the wrong clock string inside 
> the clk_get() function.
> 
> Use the correct clock string: "secondary_sel_clk".
> 
> This fixes a kernel crash after running the 'reboot' command on a
> mx6ul.
> 
> Fixes: a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to support imx6ul")
> Cc: <stable@vger.kernel.org> # 4.4.x
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Fabio Estevam May 20, 2016, 3:09 a.m. UTC | #2 
On Thu, May 19, 2016 at 11:59 PM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> Commit a35fc5a33b62a6 ("cpufreq: imx: update the clock switch flow to
> support imx6ul") introduced the 'secondary_sel_clk' clock, which is
> specific for the i.mx6ul case, but used the wrong clock string inside
> the clk_get() function.
>
> Use the correct clock string: "secondary_sel_clk".

Sorry, the  'secondary_sel' name is the one define in imx6ul.dtsi.

This patch 'fixed' the issue because it did not register cpufreq for mx6ul.

We still need to provide a proper fix for cpufreq on mx6ul. Please
discard this patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index ef1fa81..00b481e 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -212,7 +212,7 @@  static int imx6q_cpufreq_probe(struct platform_device *pdev)
 
 	if (of_machine_is_compatible("fsl,imx6ul")) {
 		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_clk");
 		if (IS_ERR(pll2_bus_clk) || IS_ERR(secondary_sel_clk)) {
 			dev_err(cpu_dev, "failed to get clocks specific to imx6ul\n");
 			ret = -ENOENT;