|
|
@@ -1546,7 +1546,7 @@ err_pm_runtime_disable:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
static struct lcdc_context {
|
|
|
u32 clk_enable;
|
|
|
u32 ctrl;
|
|
|
@@ -1610,9 +1610,9 @@ static void lcd_context_restore(void)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-static int fb_suspend(struct platform_device *dev, pm_message_t state)
|
|
|
+static int fb_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct fb_info *info = platform_get_drvdata(dev);
|
|
|
+ struct fb_info *info = dev_get_drvdata(dev);
|
|
|
struct da8xx_fb_par *par = info->par;
|
|
|
|
|
|
console_lock();
|
|
|
@@ -1622,18 +1622,18 @@ static int fb_suspend(struct platform_device *dev, pm_message_t state)
|
|
|
fb_set_suspend(info, 1);
|
|
|
lcd_disable_raster(DA8XX_FRAME_WAIT);
|
|
|
lcd_context_save();
|
|
|
- pm_runtime_put_sync(&dev->dev);
|
|
|
+ pm_runtime_put_sync(dev);
|
|
|
console_unlock();
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
-static int fb_resume(struct platform_device *dev)
|
|
|
+static int fb_resume(struct device *dev)
|
|
|
{
|
|
|
- struct fb_info *info = platform_get_drvdata(dev);
|
|
|
+ struct fb_info *info = dev_get_drvdata(dev);
|
|
|
struct da8xx_fb_par *par = info->par;
|
|
|
|
|
|
console_lock();
|
|
|
- pm_runtime_get_sync(&dev->dev);
|
|
|
+ pm_runtime_get_sync(dev);
|
|
|
lcd_context_restore();
|
|
|
if (par->blank == FB_BLANK_UNBLANK) {
|
|
|
lcd_enable_raster();
|
|
|
@@ -1647,19 +1647,17 @@ static int fb_resume(struct platform_device *dev)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
-#else
|
|
|
-#define fb_suspend NULL
|
|
|
-#define fb_resume NULL
|
|
|
#endif
|
|
|
|
|
|
+static SIMPLE_DEV_PM_OPS(fb_pm_ops, fb_suspend, fb_resume);
|
|
|
+
|
|
|
static struct platform_driver da8xx_fb_driver = {
|
|
|
.probe = fb_probe,
|
|
|
.remove = fb_remove,
|
|
|
- .suspend = fb_suspend,
|
|
|
- .resume = fb_resume,
|
|
|
.driver = {
|
|
|
.name = DRIVER_NAME,
|
|
|
.owner = THIS_MODULE,
|
|
|
+ .pm = &fb_pm_ops,
|
|
|
},
|
|
|
};
|
|
|
module_platform_driver(da8xx_fb_driver);
|