Skip to contentSkip to conversation

video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare

PATCH New Vasily Khoruzhick 2 participants 2 messages Jun 30, 2014 – Jul 1, 2014

Subsystems (2)
Framebuffer layer Arm Samsung Exynos
lore
Share & tools
lore

Vasily Khoruzhick

author
#0 lore raw

PATCH 1/1 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 Vasily Khoruzhick <[email protected]>
---
 drivers/video/fbdev/s3c2410fb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/video/fbdev/s3c2410fb.c +5 -5
index 81af5a6..d68595d 100644
@@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
 		goto release_irq;
 	}
 
-	clk_enable(info->clk);
+	clk_prepare_enable(info->clk);
 	dprintk("got and enabled clock\n");
 
 	usleep_range(1000, 1100);

@@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
 free_video_memory:
 	s3c2410fb_unmap_video_memory(fbinfo);
 release_clock:
-	clk_disable(info->clk);
+	clk_disable_unprepare(info->clk);
 	clk_put(info->clk);
 release_irq:
 	free_irq(irq, info);

@@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 	s3c2410fb_unmap_video_memory(fbinfo);
 
 	if (info->clk) {
-		clk_disable(info->clk);
+		clk_disable_unprepare(info->clk);
 		clk_put(info->clk);
 		info->clk = NULL;
 	}

@@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
 	 * before the clock goes off again (bjd) */
 
 	usleep_range(1000, 1100);
-	clk_disable(info->clk);
+	clk_disable_unprepare(info->clk);
 
 	return 0;
 }

@@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
 	struct fb_info	   *fbinfo = platform_get_drvdata(dev);
 	struct s3c2410fb_info *info = fbinfo->par;
 
-	clk_enable(info->clk);
+	clk_prepare_enable(info->clk);
 	usleep_range(1000, 1100);
 
 	s3c2410fb_init_registers(fbinfo);
Signature · 1 line
2.0.0
#1 lore raw

PATCH 1/1 video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare

Quoted 7 lines · Vasily Khoruzhick

Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework.

Signed-off-by Vasily Khoruzhick <[email protected]>
---
 drivers/video/fbdev/s3c2410fb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Thanks, queued for 3.17.

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140701/500eafb6/attachment.sig>