---

yaml
---
r: 216859
b: refs/heads/master
c: 9980ce5
h: refs/heads/master
i:
  216857: bebf3cb
  216855: aafba9d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96835af970e5d6aeedf868e53590a947be5e4a7a
+refs/heads/master: 9980ce53c97392a3dbdc9d1ac3e455d79b4167ed

trunk/arch/arm/mach-omap2/omap_hwmod.c

@@ -691,8 +691,6 @@ static void _sysc_enable(struct omap_hwmod *oh)
 		_set_module_autoidle(oh, idlemode, &v);
 	}
 
-	/* XXX OCP ENAWAKEUP bit? */
-
 	/*
 	 * XXX The clock framework should handle this, by
 	 * calling into this code.  But this must wait until the
@@ -703,6 +701,10 @@ static void _sysc_enable(struct omap_hwmod *oh)
 		_set_clockactivity(oh, oh->class->sysc->clockact, &v);
 
 	_write_sysconfig(v, oh);
+
+	/* If slave is in SMARTIDLE, also enable wakeup */
+	if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE))
+		_enable_wakeup(oh);
 }
 
 /**