Skip to content

Commit f9a2f9c

Browse files
Rajendra NayakPaul Walmsley
authored andcommitted
ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
omap_hwmod_softreset() does not seem to wait for reset status after doing a softreset. Make it use _ocp_softreset() instead which does this correctly. Signed-off-by: Rajendra Nayak <[email protected]> Cc: Benoit Cousson <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Anand Gadiyar <[email protected]> Cc: Shubhrajyoti D <[email protected]> Signed-off-by: Paul Walmsley <[email protected]>
1 parent 2800852 commit f9a2f9c

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

arch/arm/mach-omap2/omap_hwmod.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,20 +1901,10 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs)
19011901
*/
19021902
int omap_hwmod_softreset(struct omap_hwmod *oh)
19031903
{
1904-
u32 v;
1905-
int ret;
1906-
1907-
if (!oh || !(oh->_sysc_cache))
1904+
if (!oh)
19081905
return -EINVAL;
19091906

1910-
v = oh->_sysc_cache;
1911-
ret = _set_softreset(oh, &v);
1912-
if (ret)
1913-
goto error;
1914-
_write_sysconfig(v, oh);
1915-
1916-
error:
1917-
return ret;
1907+
return _ocp_softreset(oh);
19181908
}
19191909

19201910
/**

0 commit comments

Comments
 (0)