video: pxafb: add clk_prepare/clk_unprepare calls
authorPhilipp Zabel <pzabel@gmx.de>
Thu, 15 Mar 2012 18:12:00 +0000 (19:12 +0100)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 21 Mar 2012 10:29:01 +0000 (10:29 +0000)
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>
drivers/video/pxafb.c

index c176561..3f90255 100644 (file)
@@ -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);
 }
 
 /*