Thread (6 messages) flat view 6 messages, 2 authors, 2012-04-05
STALE5241d

[PATCH 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status

From: Rajendra Nayak <hidden>
Date: 2012-03-13 13:59:09
Also in: linux-omap

On Tuesday 13 March 2012 07:25 PM, Rajendra Nayak wrote:
quoted hunk ↗ jump to hunk
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<redacted>
Cc: Benoit Cousson<redacted>
Cc: Paul Walmsley<paul@pwsan.com>
Cc: Anand Gadiyar<redacted>
Cc: Shubhrajyoti D<redacted>
---
  arch/arm/mach-omap2/omap_hwmod.c |   14 +++-----------
  1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index ae56939..9b49440 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1907,20 +1907,12 @@ 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);
+	_ocp_softreset(oh);

-error:
-	return ret;
+	return 0;
Just realized, this should be 'return _ocp_softreset(oh);'
instead. will fix and repost.
  }

  /**
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help