diff options
-rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 4 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 8 | ||||
-rw-r--r-- | include/video/omapdss.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 04d9bc94c5b3..44d73f779ebe 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c | |||
@@ -932,7 +932,7 @@ err: | |||
932 | 932 | ||
933 | taal_hw_reset(dssdev); | 933 | taal_hw_reset(dssdev); |
934 | 934 | ||
935 | omapdss_dsi_display_disable(dssdev, true); | 935 | omapdss_dsi_display_disable(dssdev, true, false); |
936 | err0: | 936 | err0: |
937 | return r; | 937 | return r; |
938 | } | 938 | } |
@@ -955,7 +955,7 @@ static void taal_power_off(struct omap_dss_device *dssdev) | |||
955 | taal_hw_reset(dssdev); | 955 | taal_hw_reset(dssdev); |
956 | } | 956 | } |
957 | 957 | ||
958 | omapdss_dsi_display_disable(dssdev, true); | 958 | omapdss_dsi_display_disable(dssdev, true, false); |
959 | 959 | ||
960 | td->enabled = 0; | 960 | td->enabled = 0; |
961 | } | 961 | } |
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 8bc443bae6b1..f54839fa50b1 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -3763,9 +3763,9 @@ err0: | |||
3763 | } | 3763 | } |
3764 | 3764 | ||
3765 | static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev, | 3765 | static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev, |
3766 | bool disconnect_lanes) | 3766 | bool disconnect_lanes, bool enter_ulps) |
3767 | { | 3767 | { |
3768 | if (!dsi.ulps_enabled) | 3768 | if (enter_ulps && !dsi.ulps_enabled) |
3769 | dsi_enter_ulps(); | 3769 | dsi_enter_ulps(); |
3770 | 3770 | ||
3771 | /* disable interface */ | 3771 | /* disable interface */ |
@@ -3848,7 +3848,7 @@ err0: | |||
3848 | EXPORT_SYMBOL(omapdss_dsi_display_enable); | 3848 | EXPORT_SYMBOL(omapdss_dsi_display_enable); |
3849 | 3849 | ||
3850 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, | 3850 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, |
3851 | bool disconnect_lanes) | 3851 | bool disconnect_lanes, bool enter_ulps) |
3852 | { | 3852 | { |
3853 | DSSDBG("dsi_display_disable\n"); | 3853 | DSSDBG("dsi_display_disable\n"); |
3854 | 3854 | ||
@@ -3858,7 +3858,7 @@ void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, | |||
3858 | 3858 | ||
3859 | dsi_display_uninit_dispc(dssdev); | 3859 | dsi_display_uninit_dispc(dssdev); |
3860 | 3860 | ||
3861 | dsi_display_uninit_dsi(dssdev, disconnect_lanes); | 3861 | dsi_display_uninit_dsi(dssdev, disconnect_lanes, enter_ulps); |
3862 | 3862 | ||
3863 | enable_clocks(0); | 3863 | enable_clocks(0); |
3864 | dsi_enable_pll_clock(0); | 3864 | dsi_enable_pll_clock(0); |
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 0a10a234a989..44a864648c15 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h | |||
@@ -590,7 +590,7 @@ void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel); | |||
590 | 590 | ||
591 | int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); | 591 | int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); |
592 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, | 592 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, |
593 | bool disconnect_lanes); | 593 | bool disconnect_lanes, bool enter_ulps); |
594 | 594 | ||
595 | int omapdss_dpi_display_enable(struct omap_dss_device *dssdev); | 595 | int omapdss_dpi_display_enable(struct omap_dss_device *dssdev); |
596 | void omapdss_dpi_display_disable(struct omap_dss_device *dssdev); | 596 | void omapdss_dpi_display_disable(struct omap_dss_device *dssdev); |