OMAP4: DSS: SW reset not required in dss init
In omap3 & omap4, soft reset is being done by HWMOD thus
not required to be done again in dss initialization
but reset is required in all the others.
This chnage is tested on omap4 and omap3 sdp and display
is working fine.
Change-Id: I725ab78b392e865047a2a385373f2ba88ff5832c
Signed-off-by: Sujeet Baranwal <s-baranwal@ti.com>
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 75d0912..d8fbc1a 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3179,7 +3179,8 @@
.rev_offs = 0x0000,
.sysc_offs = 0x0010,
.syss_offs = 0x0014,
- .sysc_flags = (SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
+ .sysc_flags = (SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
+ SYSS_HAS_RESET_STATUS),
.sysc_fields = &omap_hwmod_sysc_type1,
};
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 4007b65..14ec286 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -651,13 +651,6 @@
return 0;
}
-static int _omap_dss_reset(void)
-{
- /* Soft reset */
- REG_FLD_MOD(DSS_SYSCONFIG, 1, 1, 1);
- return _omap_dss_wait_reset();
-}
-
void dss_set_venc_output(enum omap_dss_venc_type type)
{
int l = 0;
@@ -735,10 +728,6 @@
* enabling clocks.
*/
msleep(50);
-
- /* In OMAP44xx HWMOD would take care of resetting the module */
- if (cpu_is_omap44xx())
- _omap_dss_reset();
}
/* autoidle */
