1 files changed, 13 insertions, 14 deletions

diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index af2aa387ec17..4280d23e3300 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -26,6 +26,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
+#include <linux/pm_runtime.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
 #include <linux/clk.h>
@@ -1037,8 +1038,8 @@ static int __devexit fb_remove(struct platform_device *dev)
                 dma_free_coherent(NULL, par->vram_size, par->vram_virt,
                                   par->vram_phys);
                 free_irq(par->irq, par);
-                clk_disable(par->lcdc_clk);
-                clk_put(par->lcdc_clk);
+                pm_runtime_put_sync(&dev->dev);
+                pm_runtime_disable(&dev->dev);
                 framebuffer_release(info);
                 iounmap((void __iomem *)da8xx_fb_reg_base);
                 release_mem_region(lcdc_regs->start, resource_size(lcdc_regs));
@@ -1272,9 +1273,9 @@ static int __devinit fb_probe(struct platform_device *device)
                 ret = -ENODEV;
                 goto err_ioremap;
         }
-        ret = clk_enable(fb_clk);
-        if (ret)
-                goto err_clk_put;
+
+        pm_runtime_enable(&device->dev);
+        pm_runtime_get_sync(&device->dev);
 
         /* Determine LCD IP Version */
         switch (lcdc_read(LCD_PID_REG)) {
@@ -1302,7 +1303,7 @@ static int __devinit fb_probe(struct platform_device *device)
         if (i == ARRAY_SIZE(known_lcd_panels)) {
                 dev_err(&device->dev, "GLCD: No valid panel found\n");
                 ret = -ENODEV;
-                goto err_clk_disable;
+                goto err_pm_runtime_disable;
         } else
                 dev_info(&device->dev, "GLCD: Found %s panel\n",
                                         fb_pdata->type);
@@ -1314,7 +1315,7 @@ static int __devinit fb_probe(struct platform_device *device)
         if (!da8xx_fb_info) {
                 dev_dbg(&device->dev, "Memory allocation failed for fb_info\n");
                 ret = -ENOMEM;
-                goto err_clk_disable;
+                goto err_pm_runtime_disable;
         }
 
         par = da8xx_fb_info->par;
@@ -1476,11 +1477,9 @@ err_release_fb_mem:
 err_release_fb:
         framebuffer_release(da8xx_fb_info);
 
-err_clk_disable:
-        clk_disable(fb_clk);
-
-err_clk_put:
-        clk_put(fb_clk);
+err_pm_runtime_disable:
+        pm_runtime_put_sync(&device->dev);
+        pm_runtime_disable(&device->dev);
 
 err_ioremap:
         iounmap((void __iomem *)da8xx_fb_reg_base);
@@ -1503,7 +1502,7 @@ static int fb_suspend(struct platform_device *dev, pm_message_t state)
 
         fb_set_suspend(info, 1);
         lcd_disable_raster(true);
-        clk_disable(par->lcdc_clk);
+        pm_runtime_put_sync(&dev->dev);
         console_unlock();
 
         return 0;
@@ -1514,7 +1513,7 @@ static int fb_resume(struct platform_device *dev)
         struct da8xx_fb_par *par = info->par;
 
         console_lock();
-        clk_enable(par->lcdc_clk);
+        pm_runtime_get_sync(&dev->dev);
         if (par->blank == FB_BLANK_UNBLANK) {
                 lcd_enable_raster();