aboutsummaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorPhilipp Zabel <pzabel@gmx.de>2012-03-15 19:12:00 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-21 10:29:01 +0000
commitb622f1b538f91ab320838656fc0b31d11a67c5fc (patch)
treea1c9e890cc8d5964ee89374d1f8213105c97e6c1 /drivers/video
parentcfc4bcfe84e14b858dc6a1ab6bbf34d69edabc27 (diff)
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. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Cc: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/pxafb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index c176561a222..3f902557690 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1435,7 +1435,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;
@@ -1475,7 +1475,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);
}
/*