aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-18 05:58:24 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-07-25 03:08:16 -0400
commitde3050a74e2d2830189ceaa5f5fc05b776518d68 (patch)
tree7929758add4bafb8143e8a3b554a790124f17a50 /drivers/video
parent7e42403e3bbce191ad7e4ce8c598d48be6232f57 (diff)
OMAP: DSS2: Remove CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET
CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET is used to avoid an unclear bug at DSS reset time. The pm runtime will handle reset in the future, and this code has to be removed. Hopefully we won't see this error anymore. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/Kconfig12
-rw-r--r--drivers/video/omap2/dss/dss.c13
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 6b3e2da11419..0d12524db14b 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -117,18 +117,6 @@ config OMAP2_DSS_MIN_FCK_PER_PCK
117 Max FCK is 173MHz, so this doesn't work if your PCK 117 Max FCK is 173MHz, so this doesn't work if your PCK
118 is very high. 118 is very high.
119 119
120config OMAP2_DSS_SLEEP_BEFORE_RESET
121 bool "Sleep 50ms before DSS reset"
122 default y
123 help
124 For some unknown reason we may get SYNC_LOST errors from the display
125 subsystem at initialization time if we don't sleep before resetting
126 the DSS. See the source (dss.c) for more comments.
127
128 However, 50ms is quite long time to sleep, and with some
129 configurations the SYNC_LOST may never happen, so the sleep can
130 be disabled here.
131
132config OMAP2_DSS_SLEEP_AFTER_VENC_RESET 120config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
133 bool "Sleep 20ms after VENC reset" 121 bool "Sleep 20ms after VENC reset"
134 default y 122 default y
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index ff5664e0856c..810ea8cbc1e6 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)
1037 * the kernel resets it */ 1037 * the kernel resets it */
1038 omap_writel(omap_readl(0x48050440) & ~0x3, 0x48050440); 1038 omap_writel(omap_readl(0x48050440) & ~0x3, 0x48050440);
1039 1039
1040#ifdef CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET
1041 /* We need to wait here a bit, otherwise we sometimes start to
1042 * get synclost errors, and after that only power cycle will
1043 * restore DSS functionality. I have no idea why this happens.
1044 * And we have to wait _before_ resetting the DSS, but after
1045 * enabling clocks.
1046 *
1047 * This bug was at least present on OMAP3430. It's unknown
1048 * if it happens on OMAP2 or OMAP3630.
1049 */
1050 msleep(50);
1051#endif
1052
1053 _omap_dss_reset(); 1040 _omap_dss_reset();
1054 1041
1055 /* autoidle */ 1042 /* autoidle */