提交 1add0353 编写于 作者: V Vasily Khoruzhick 提交者: Tomi Valkeinen

video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare

Use clk_prepare_enable/clk_disable_unprepare to make the driver
work properly with common clock framework.
Signed-off-by: NVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 981409b2
...@@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev, ...@@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
goto release_irq; goto release_irq;
} }
clk_enable(info->clk); clk_prepare_enable(info->clk);
dprintk("got and enabled clock\n"); dprintk("got and enabled clock\n");
usleep_range(1000, 1100); usleep_range(1000, 1100);
...@@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev, ...@@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
free_video_memory: free_video_memory:
s3c2410fb_unmap_video_memory(fbinfo); s3c2410fb_unmap_video_memory(fbinfo);
release_clock: release_clock:
clk_disable(info->clk); clk_disable_unprepare(info->clk);
clk_put(info->clk); clk_put(info->clk);
release_irq: release_irq:
free_irq(irq, info); free_irq(irq, info);
...@@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev) ...@@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
s3c2410fb_unmap_video_memory(fbinfo); s3c2410fb_unmap_video_memory(fbinfo);
if (info->clk) { if (info->clk) {
clk_disable(info->clk); clk_disable_unprepare(info->clk);
clk_put(info->clk); clk_put(info->clk);
info->clk = NULL; info->clk = NULL;
} }
...@@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state) ...@@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
* before the clock goes off again (bjd) */ * before the clock goes off again (bjd) */
usleep_range(1000, 1100); usleep_range(1000, 1100);
clk_disable(info->clk); clk_disable_unprepare(info->clk);
return 0; return 0;
} }
...@@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev) ...@@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
struct fb_info *fbinfo = platform_get_drvdata(dev); struct fb_info *fbinfo = platform_get_drvdata(dev);
struct s3c2410fb_info *info = fbinfo->par; struct s3c2410fb_info *info = fbinfo->par;
clk_enable(info->clk); clk_prepare_enable(info->clk);
usleep_range(1000, 1100); usleep_range(1000, 1100);
s3c2410fb_init_registers(fbinfo); s3c2410fb_init_registers(fbinfo);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册