2 files changed, 0 insertions, 25 deletions

diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 6b3e2da1141..0d12524db14 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -117,18 +117,6 @@ config OMAP2_DSS_MIN_FCK_PER_PCK
           Max FCK is 173MHz, so this doesn't work if your PCK
           is very high.
 
-config OMAP2_DSS_SLEEP_BEFORE_RESET
-        bool "Sleep 50ms before DSS reset"
-        default y
-        help
-          For some unknown reason we may get SYNC_LOST errors from the display
-          subsystem at initialization time if we don't sleep before resetting
-          the DSS. See the source (dss.c) for more comments.
-
-          However, 50ms is quite long time to sleep, and with some
-          configurations the SYNC_LOST may never happen, so the sleep can
-          be disabled here.
-
 config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
         bool "Sleep 20ms after VENC reset"
         default y
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index ff5664e0856..810ea8cbc1e 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -1037,19 +1037,6 @@ static int omap_dsshw_probe(struct platform_device *pdev)
          * the kernel resets it */
         omap_writel(omap_readl(0x48050440) & ~0x3, 0x48050440);
 
-#ifdef CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET
-        /* We need to wait here a bit, otherwise we sometimes start to
-         * get synclost errors, and after that only power cycle will
-         * restore DSS functionality. I have no idea why this happens.
-         * And we have to wait _before_ resetting the DSS, but after
-         * enabling clocks.
-         *
-         * This bug was at least present on OMAP3430. It's unknown
-         * if it happens on OMAP2 or OMAP3630.
-         */
-        msleep(50);
-#endif
-
         _omap_dss_reset();
 
         /* autoidle */