aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/s3c-fb.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2011-05-24 04:55:31 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 05:04:31 -0400
commit6aa9681100303bd467cbd0262eb00da8d492fc7f (patch)
treed4193e16b985cb4c4f289dcac30204f14bb53325 /drivers/video/s3c-fb.c
parent8f25c01dec43ccfb0ec7d6216c1494772917a429 (diff)
video: s3c-fb: add gpio setup function to resume function
This patch adds gpio setup function to resume function to ensure gpio used by FIMD IP and LCD panel during a resume. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/s3c-fb.c')
-rw-r--r--drivers/video/s3c-fb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 6b7c5a8aea8a..2bd86a9fa3a0 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1526,7 +1526,8 @@ static int s3c_fb_resume(struct device *dev)
1526 1526
1527 clk_enable(sfb->bus_clk); 1527 clk_enable(sfb->bus_clk);
1528 1528
1529 /* setup registers */ 1529 /* setup gpio and output polarity controls */
1530 pd->setup_gpio();
1530 writel(pd->vidcon1, sfb->regs + VIDCON1); 1531 writel(pd->vidcon1, sfb->regs + VIDCON1);
1531 1532
1532 /* zero all windows before we do anything */ 1533 /* zero all windows before we do anything */
@@ -1584,7 +1585,8 @@ static int s3c_fb_runtime_resume(struct device *dev)
1584 1585
1585 clk_enable(sfb->bus_clk); 1586 clk_enable(sfb->bus_clk);
1586 1587
1587 /* setup registers */ 1588 /* setup gpio and output polarity controls */
1589 pd->setup_gpio();
1588 writel(pd->vidcon1, sfb->regs + VIDCON1); 1590 writel(pd->vidcon1, sfb->regs + VIDCON1);
1589 1591
1590 /* zero all windows before we do anything */ 1592 /* zero all windows before we do anything */