summaryrefslogtreecommitdiff
path: root/drivers/video/mcde
diff options
context:
space:
mode:
authorPer Persson <per.xb.persson@stericsson.com>2011-06-07 10:37:21 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-12-06 10:58:50 +0100
commit7472176af62c074923be55e0815baa05d005d4cf (patch)
tree3be509fbd1ca8e3e146d379ee4fdec4f3f35547b /drivers/video/mcde
parenta747397530c444c99f0c6722669538e87118c21d (diff)
video: av8100: Add suspend resume
Parts of suspend/resume handling are moved from display driver to av8100 driver. ST-Ericsson ID: 326691 ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I9a6ac38c138bfea4cf07d3b38d16d4ac95d05a84 Signed-off-by: Per Persson <per.xb.persson@stericsson.com>
Diffstat (limited to 'drivers/video/mcde')
-rw-r--r--drivers/video/mcde/display-av8100.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/video/mcde/display-av8100.c b/drivers/video/mcde/display-av8100.c
index 9134e4bf33f..99070b6071f 100644
--- a/drivers/video/mcde/display-av8100.c
+++ b/drivers/video/mcde/display-av8100.c
@@ -1253,13 +1253,6 @@ static int hdmi_set_power_mode(struct mcde_display_device *ddev,
return ret;
}
- ret = av8100_powerup();
- if (ret) {
- dev_err(&ddev->dev, "av8100_powerup failed\n");
- return ret;
- }
- av8100_enable_interrupt();
-
/*
* the regulator for analog TV out is only enabled here,
* this means that one needs to switch to the OFF state
@@ -1292,10 +1285,7 @@ static int hdmi_set_power_mode(struct mcde_display_device *ddev,
if (ddev->power_mode == MCDE_DISPLAY_PM_STANDBY &&
power_mode == MCDE_DISPLAY_PM_OFF) {
memset(&(ddev->video_mode), 0, sizeof(struct mcde_video_mode));
- ret = av8100_powerdown();
- if (ret)
- dev_err(&ddev->dev, "%s:av8100_powerdown failed\n"
- , __func__);
+
if (ddev->platform_disable) {
ret = ddev->platform_disable(ddev);
if (ret)