summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJason Jin <Jason.Jin@freescale.com>2015-08-14 07:54:09 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-09-24 12:05:57 +0200
commite03dc19ba9c7ebc48cedc9cb797fa42dff302565 (patch)
treeb90b0fbb6279e05c4d742750a7e8bbdd42a03760 /drivers/video
parentLinux 4.3-rc2 (diff)
downloadlinux-e03dc19ba9c7ebc48cedc9cb797fa42dff302565.tar.xz
linux-e03dc19ba9c7ebc48cedc9cb797fa42dff302565.zip
video: fbdev: fsl: Fix the sleep function for FSL DIU module
For deep sleep, the diu module will power off, when wake up from the deep sleep, the registers need to be reinitialized. Signed-off-by: Jason Jin <Jason.Jin@freescale.com> Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Acked-by: Timur Tabi <timur@tabi.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/fsl-diu-fb.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c
index 7fa2e6f9e322..b335c1ae8625 100644
--- a/drivers/video/fbdev/fsl-diu-fb.c
+++ b/drivers/video/fbdev/fsl-diu-fb.c
@@ -1628,9 +1628,16 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state)
static int fsl_diu_resume(struct platform_device *ofdev)
{
struct fsl_diu_data *data;
+ unsigned int i;
data = dev_get_drvdata(&ofdev->dev);
- enable_lcdc(data->fsl_diu_info);
+
+ fsl_diu_enable_interrupts(data);
+ update_lcdc(data->fsl_diu_info);
+ for (i = 0; i < NUM_AOIS; i++) {
+ if (data->mfb[i].count)
+ fsl_diu_enable_panel(&data->fsl_diu_info[i]);
+ }
return 0;
}