summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2010-12-20 16:26:22 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-11 14:20:17 +0300
commit88257b26953f73f30acf49587cb42b84be43c587 (patch)
tree504d67f7356c700083e1611fd7e374d9496a194f /drivers/video/omap2
parentd1f5857e4bc9b2620fb3e84b1dbaa0ac11b831b4 (diff)
downloadlinux-0-day-88257b26953f73f30acf49587cb42b84be43c587.tar.gz
linux-0-day-88257b26953f73f30acf49587cb42b84be43c587.tar.xz
OMAP: DSS2: DSI: ensure VDDS_DSI is disabled on exit
The panel drivers can leave the VDDS_DSI regulator enabled, even when the panel is disabled, to ensure that the DSI pins are powered. This patch ensures that VDDS_DSI is disabled on DSI module unload. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/dsi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index fcda46c34d1c9..f89994d7b0004 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4090,6 +4090,11 @@ err1:
static void dsi_exit(void)
{
if (dsi.vdds_dsi_reg != NULL) {
+ if (dsi.vdds_dsi_enabled) {
+ regulator_disable(dsi.vdds_dsi_reg);
+ dsi.vdds_dsi_enabled = false;
+ }
+
regulator_put(dsi.vdds_dsi_reg);
dsi.vdds_dsi_reg = NULL;
}