summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@nokia.com>2010-04-22 22:50:09 +0200
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-05 15:51:56 +0200
commitd73701044b70924f450fc6b161d952b38b7d0182 (patch)
treec7ed2796c18f46c38527b2090ed9a2f6e410eddf /drivers/video
parentOMAP: DSS2: DSI: Wait for DSI PLL clocks to be active before selecting them (diff)
downloadlinux-d73701044b70924f450fc6b161d952b38b7d0182.tar.xz
linux-d73701044b70924f450fc6b161d952b38b7d0182.zip
OMAP: DSS2: DSI: Disable interface when disabling the display
Once the DSI PLL is separated from the DSI display a full DSI reset will not be performed every time the display is enabled so the interface and VCs must be disabled when disabling the display. If the VCs are not disabled some register accesses will abort. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dsi.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 6035904f1314..20291570f7a7 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3068,6 +3068,13 @@ err0:
static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev)
{
+ /* disable interface */
+ dsi_if_enable(0);
+ dsi_vc_enable(0, 0);
+ dsi_vc_enable(1, 0);
+ dsi_vc_enable(2, 0);
+ dsi_vc_enable(3, 0);
+
dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
dss_select_dsi_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
dsi_complexio_uninit();