Skip to contentSkip to conversation

video: pxafb: add clk_prepare/clk_unprepare calls

PATCH Applied Philipp Zabel 2 participants 2 messages Mar 15, 2012 – Mar 21, 2012 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 video: pxafb: add clk_prepare/clk_unprepare calls

This patch adds clk_prepare/clk_unprepare calls to the pxafb driver by using the helper functions clk_prepare_enable and clk_disable_unprepare.

Cc Haojian Zhuang <[email protected]>
Cc Eric Miao <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
---
 drivers/video/pxafb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/pxafb.c +2 -2
index 1d1e4f1..904f839 100644
@@ -1431,7 +1431,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
 	pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
 	/* enable LCD controller clock */
-	clk_enable(fbi->clk);
+	clk_prepare_enable(fbi->clk);
 
 	if (fbi->lccr0 & LCCR0_LCDT)
 		return;
@@ -1471,7 +1471,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
 	wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000);
 
 	/* disable LCD controller clock */
-	clk_disable(fbi->clk);
+	clk_disable_unprepare(fbi->clk);
 }
 
 /*
Signature · 1 line
1.7.9.1
#1 lore raw
Quoted 8 lines · Philipp Zabel

This patch adds clk_prepare/clk_unprepare calls to the pxafb driver by using the helper functions clk_prepare_enable and clk_disable_unprepare.

Cc Haojian Zhuang <[email protected]>
Cc Eric Miao <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>

Applied.

Thanks,

Florian Tobias Schandinat

Quoted 26 lines
---
 drivers/video/pxafb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/pxafb.c +2 -2
index 1d1e4f1..904f839 100644
@@ -1431,7 +1431,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
 	pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
 	/* enable LCD controller clock */
-	clk_enable(fbi->clk);
+	clk_prepare_enable(fbi->clk);
 
 	if (fbi->lccr0 & LCCR0_LCDT)
 		return;
@@ -1471,7 +1471,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
 	wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000);
 
 	/* disable LCD controller clock */
-	clk_disable(fbi->clk);
+	clk_disable_unprepare(fbi->clk);
 }
 
 /*