1 files changed, 24 insertions, 15 deletions

diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c
index 372d4aea9d1c..0676746ec68c 100644
--- a/drivers/video/fbdev/au1100fb.c
+++ b/drivers/video/fbdev/au1100fb.c
@@ -41,6 +41,7 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -113,7 +114,7 @@ static int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
         case VESA_NO_BLANKING:
                 /* Turn on panel */
                 fbdev->regs->lcd_control |= LCD_CONTROL_GO;
-                au_sync();
+                wmb(); /* drain writebuffer */
                 break;
 
         case VESA_VSYNC_SUSPEND:
@@ -121,7 +122,7 @@ static int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
         case VESA_POWERDOWN:
                 /* Turn off panel */
                 fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
-                au_sync();
+                wmb(); /* drain writebuffer */
                 break;
         default:
                 break;
@@ -434,7 +435,7 @@ static int au1100fb_drv_probe(struct platform_device *dev)
         struct au1100fb_device *fbdev = NULL;
         struct resource *regs_res;
         unsigned long page;
-        u32 sys_clksrc;
+        struct clk *c;
 
         /* Allocate new device private */
         fbdev = devm_kzalloc(&dev->dev, sizeof(struct au1100fb_device),
@@ -473,6 +474,13 @@ static int au1100fb_drv_probe(struct platform_device *dev)
         print_dbg("Register memory map at %p", fbdev->regs);
         print_dbg("phys=0x%08x, size=%d", fbdev->regs_phys, fbdev->regs_len);
 
+        c = clk_get(NULL, "lcd_intclk");
+        if (!IS_ERR(c)) {
+                fbdev->lcdclk = c;
+                clk_set_rate(c, 48000000);
+                clk_prepare_enable(c);
+        }
+
         /* Allocate the framebuffer to the maximum screen size * nbr of video buffers */
         fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres *
                         (fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS;
@@ -506,10 +514,6 @@ static int au1100fb_drv_probe(struct platform_device *dev)
         print_dbg("Framebuffer memory map at %p", fbdev->fb_mem);
         print_dbg("phys=0x%08x, size=%dK", fbdev->fb_phys, fbdev->fb_len / 1024);
 
-        /* Setup LCD clock to AUX (48 MHz) */
-        sys_clksrc = au_readl(SYS_CLKSRC) & ~(SYS_CS_ML_MASK | SYS_CS_DL | SYS_CS_CL);
-        au_writel((sys_clksrc | (1 << SYS_CS_ML_BIT)), SYS_CLKSRC);
-
         /* load the panel info into the var struct */
         au1100fb_var.bits_per_pixel = fbdev->panel->bpp;
         au1100fb_var.xres = fbdev->panel->xres;
@@ -546,6 +550,10 @@ static int au1100fb_drv_probe(struct platform_device *dev)
         return 0;
 
 failed:
+        if (fbdev->lcdclk) {
+                clk_disable_unprepare(fbdev->lcdclk);
+                clk_put(fbdev->lcdclk);
+        }
         if (fbdev->fb_mem) {
                 dma_free_noncoherent(&dev->dev, fbdev->fb_len, fbdev->fb_mem,
                                      fbdev->fb_phys);
@@ -576,11 +584,15 @@ int au1100fb_drv_remove(struct platform_device *dev)
 
         fb_dealloc_cmap(&fbdev->info.cmap);
 
+        if (fbdev->lcdclk) {
+                clk_disable_unprepare(fbdev->lcdclk);
+                clk_put(fbdev->lcdclk);
+        }
+
         return 0;
 }
 
 #ifdef CONFIG_PM
-static u32 sys_clksrc;
 static struct au1100fb_regs fbregs;
 
 int au1100fb_drv_suspend(struct platform_device *dev, pm_message_t state)
@@ -590,14 +602,11 @@ int au1100fb_drv_suspend(struct platform_device *dev, pm_message_t state)
         if (!fbdev)
                 return 0;
 
-        /* Save the clock source state */
-        sys_clksrc = au_readl(SYS_CLKSRC);
-
         /* Blank the LCD */
         au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);
 
-        /* Stop LCD clocking */
-        au_writel(sys_clksrc & ~SYS_CS_ML_MASK, SYS_CLKSRC);
+        if (fbdev->lcdclk)
+                clk_disable(fbdev->lcdclk);
 
         memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs));
 
@@ -613,8 +622,8 @@ int au1100fb_drv_resume(struct platform_device *dev)
 
         memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs));
 
-        /* Restart LCD clocking */
-        au_writel(sys_clksrc, SYS_CLKSRC);
+        if (fbdev->lcdclk)
+                clk_enable(fbdev->lcdclk);
 
         /* Unblank the LCD */
         au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info);