Skip to content

Commit

Permalink
da8xx-fb: add pm_runtime support
Browse files Browse the repository at this point in the history
Add pm_runtime support to the da8xx-fb frame buffer driver.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
Manjunathappa, Prakash authored and Florian Tobias Schandinat committed Oct 10, 2012
1 parent b8c4321 commit 9dd44d5
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions drivers/video/da8xx-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -1476,11 +1477,9 @@ static int __devinit fb_probe(struct platform_device *device)
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);
Expand All @@ -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;
Expand All @@ -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();

Expand Down

0 comments on commit 9dd44d5

Please sign in to comment.