From 7495f13a1a0e2379b164f3f2a11efc3812f39924 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 8 Dec 2009 16:34:14 -0700
Subject: [PATCH] --- yaml --- r: 175627 b: refs/heads/master c:
 b835d0142196466c5ff3695b90cff1e3ea635c8e h: refs/heads/master i:   175625:
 ede4bbbbed3426ed962ddde4723d401f5ce593bb   175623:
 44d3a4766c1a3b2e126b1a9e4abeac7f091b0b0b v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod.c | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1492e0ee5c71..ffd826f8261f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8b7ff5b01e16a65c3b17865ce047faeca40907
+refs/heads/master: b835d0142196466c5ff3695b90cff1e3ea635c8e
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index 7aaf5f1eea7a..65a8e0ae394f 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -945,11 +945,19 @@ static int _setup(struct omap_hwmod *oh)
 
 	_enable(oh);
 
-	if (!(oh->flags & HWMOD_INIT_NO_RESET))
-		_reset(oh);
-
-	/* XXX OCP AUTOIDLE bit? */
-	/* XXX OCP ENAWAKEUP bit? */
+	if (!(oh->flags & HWMOD_INIT_NO_RESET)) {
+		/*
+		 * XXX Do the OCP_SYSCONFIG bits need to be
+		 * reprogrammed after a reset?  If not, then this can
+		 * be removed.  If they do, then probably the
+		 * _enable() function should be split to avoid the
+		 * rewrite of the OCP_SYSCONFIG register.
+		 */
+		if (oh->sysconfig) {
+			_update_sysc_cache(oh);
+			_sysc_enable(oh);
+		}
+	}
 
 	if (!(oh->flags & HWMOD_INIT_NO_IDLE))
 		_idle(oh);