diff options
| author | Robby Cai <r63905@freescale.com> | 2015-08-27 20:34:32 +0800 |
|---|---|---|
| committer | Fancy Fang <chen.fang@nxp.com> | 2016-03-01 10:52:57 +0800 |
| commit | 8ddaa850df8cc9fe4dda4f505053eaa3f704ef69 (patch) | |
| tree | 78f314aea55a47d163dc6ca5ce2debb886b69389 /drivers | |
| parent | 1485cdac101c3af768ac7096c09f1b66f5ca15a0 (diff) | |
MLK-11438-4 lcdif: enable lpsr mode
restore the pinmux when resume from LPSR mode in suspend.
Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit 0462eb2cb8b64508260d9c6daa9f163d68ea6be0)
Conflicts:
drivers/video/mxsfb.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbdev/mxsfb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index 1849a48fe3df..8cbecbf31da8 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -1568,6 +1568,9 @@ static int mxsfb_suspend(struct device *pdev) mxsfb_blank(FB_BLANK_POWERDOWN, fb_info); host->restore_blank = saved_blank; console_unlock(); + + pinctrl_pm_select_sleep_state(pdev); + return 0; } @@ -1576,6 +1579,8 @@ static int mxsfb_resume(struct device *pdev) struct fb_info *fb_info = dev_get_drvdata(pdev); struct mxsfb_info *host = to_imxfb_host(fb_info); + pinctrl_pm_select_default_state(pdev); + console_lock(); mxsfb_blank(host->restore_blank, fb_info); fb_set_suspend(fb_info, 0); |