video: fbdev: pxa3xx_gcu: prepare the clocks

rjarzmik · tomba · commit 9e6e35edb330 · 2015-08-10T12:25:43.000+03:00
The clocks need to be prepared before being enabled. Without it a warning appears in the drivers probe path : WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:707 clk_core_enable+0x84/0xa0() Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 4.2.0-rc3-cm-x300+ torvalds#804 Hardware name: CM-X300 module [<c000ed50>] (unwind_backtrace) from [<c000ce08>] (show_stack+0x10/0x14) [<c000ce08>] (show_stack) from [<c0017eb4>] (warn_slowpath_common+0x7c/0xb4) [<c0017eb4>] (warn_slowpath_common) from [<c0017f88>] (warn_slowpath_null+0x1c/0x24) [<c0017f88>] (warn_slowpath_null) from [<c02d30dc>] (clk_core_enable+0x84/0xa0) [<c02d30dc>] (clk_core_enable) from [<c02d3118>] (clk_enable+0x20/0x34) [<c02d3118>] (clk_enable) from [<c0200dfc>] (pxa3xx_gcu_probe+0x148/0x338) [<c0200dfc>] (pxa3xx_gcu_probe) from [<c022eccc>] (platform_drv_probe+0x30/0x94) Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -653,7 +653,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
 		goto err_free_dma;
 	}
 
-	ret = clk_enable(priv->clk);
+	ret = clk_prepare_enable(priv->clk);
 	if (ret < 0) {
 		dev_err(dev, "failed to enable clock\n");
 		goto err_misc_deregister;
@@ -685,7 +685,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
 	misc_deregister(&priv->misc_dev);
 
 err_disable_clk:
-	clk_disable(priv->clk);
+	clk_disable_unprepare(priv->clk);
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)`
`653`	`653`	`goto err_free_dma;`
`654`	`654`	`}`
`655`	`655`
`656`		`- ret = clk_enable(priv->clk);`
	`656`	`+ ret = clk_prepare_enable(priv->clk);`
`657`	`657`	`if (ret < 0) {`
`658`	`658`	`dev_err(dev, "failed to enable clock\n");`
`659`	`659`	`goto err_misc_deregister;`
`@@ -685,7 +685,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)`
`685`	`685`	`misc_deregister(&priv->misc_dev);`
`686`	`686`
`687`	`687`	`err_disable_clk:`
`688`		`- clk_disable(priv->clk);`
	`688`	`+ clk_disable_unprepare(priv->clk);`
`689`	`689`
`690`	`690`	`return ret;`
`691`	`691`	`}`