From e9aee2a19979fd78a3f787732987da8ae09ef78f Mon Sep 17 00:00:00 2001 From: Jimmy Rubin Date: Thu, 1 Dec 2011 12:35:37 +0100 Subject: video: mcde: Handle MCDE_DISPLAY_PM_ON in probe When startup graphics is enabled, valid power modes are MCDE_DISPLAY_PM_ON and MCDE_DISPLAY_PM_STANDBY. Handling of MCDE_DISPLAY_PM_ON is added to the probes of the displays. ST-Ericsson ID: 400915 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3d268096ac3640c53f20811e7dc0988b0b605ffe Signed-off-by: Jimmy Rubin Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/40910 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Jayarami REDDY Reviewed-by: Per PERSSON --- drivers/video/mcde/display-samsung_s6d16d0.c | 2 +- drivers/video/mcde/display-sony_acx424akp_dsi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/mcde/display-samsung_s6d16d0.c b/drivers/video/mcde/display-samsung_s6d16d0.c index 09c9e817e7f..2f67f3e6abf 100644 --- a/drivers/video/mcde/display-samsung_s6d16d0.c +++ b/drivers/video/mcde/display-samsung_s6d16d0.c @@ -180,7 +180,7 @@ static int __devinit samsung_s6d16d0_probe(struct mcde_display_device *ddev) goto regulator_voltage_failed; /* Get in sync with u-boot */ - if (ddev->power_mode == MCDE_DISPLAY_PM_STANDBY) + if (ddev->power_mode != MCDE_DISPLAY_PM_OFF) (void)regulator_enable(di->regulator); ddev->set_power_mode = set_power_mode; diff --git a/drivers/video/mcde/display-sony_acx424akp_dsi.c b/drivers/video/mcde/display-sony_acx424akp_dsi.c index b570e832893..b8fbe708893 100644 --- a/drivers/video/mcde/display-sony_acx424akp_dsi.c +++ b/drivers/video/mcde/display-sony_acx424akp_dsi.c @@ -285,9 +285,9 @@ static int __devinit sony_acx424akp_probe(struct mcde_display_device *dev) * This is the case here, the display driver has to * enable the regulator for the display. */ - if (dev->power_mode == MCDE_DISPLAY_PM_STANDBY) { + if (dev->power_mode != MCDE_DISPLAY_PM_OFF) { (void) regulator_enable(di->regulator); - } else if (dev->power_mode == MCDE_DISPLAY_PM_OFF) { + } else { power_on(dev); dev->power_mode = MCDE_DISPLAY_PM_STANDBY; } -- cgit v1.2.3