Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9a2f9c3 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Paul Walmsley
Browse files

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: default avatarRajendra Nayak <rnayak@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 2800852a

arch/arm/mach-omap2/omap_hwmod.c

+2 −12
Original line number Diff line number Diff line
@@ -1901,20 +1901,10 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs) 
 */

int omap_hwmod_softreset(struct omap_hwmod *oh)

{

	u32 v;

	int ret;



	if (!oh || !(oh->_sysc_cache))

	if (!oh)

		return -EINVAL;



	v = oh->_sysc_cache;

	ret = _set_softreset(oh, &v);

	if (ret)

		goto error;

	_write_sysconfig(v, oh);



error:

	return ret;

	return _ocp_softreset(oh);

}



/**