Merge tag 'omap-fixes-a2-for-3.4rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes

From Paul Walmsley:

OMAP clock, powerdomain, clockdomain, and hwmod fixes intended for the
early v3.4-rc series.  Also contains an HSMMC integration refinement
of an earlier hardware bug workaround.

* tag 'omap-fixes-a2-for-3.4rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
  ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions
  ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
  ARM: OMAP2+: hwmod: Restore sysc after a reset
  ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules
  ARM: OMAP3: clock data: fill in some missing clockdomains
  ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock
  ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL
  ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()
  ARM: OMAP AM3517/3505: clock data: change EMAC clocks aliases
  ARM: OMAP: clock: fix race in disable all clocks
  ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks
  ARM: OMAP3xxx: clock data: fix DPLL4 CLKSEL masks
  ARM: OMAP3xxx: HSMMC: avoid erratum workaround when transceiver is attached
  ARM: OMAP44xx: clockdomain data: correct the emu_sys_clkdm CLKTRCTRL data

1 files changed, 38 insertions, 50 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index f9b9bb9c3e3..2c27fdb61e6 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1479,6 +1479,11 @@ static int _reset(struct omap_hwmod *oh)
 
         ret = (oh->class->reset) ? oh->class->reset(oh) : _ocp_softreset(oh);
 
+        if (oh->class->sysc) {
+                _update_sysc_cache(oh);
+                _enable_sysc(oh);
+        }
+
         return ret;
 }
 
@@ -1788,20 +1793,9 @@ static int _setup(struct omap_hwmod *oh, void *data)
                 return 0;
         }
 
-        if (!(oh->flags & HWMOD_INIT_NO_RESET)) {
+        if (!(oh->flags & HWMOD_INIT_NO_RESET))
                 _reset(oh);
 
-                /*
-                 * OCP_SYSCONFIG bits need to be reprogrammed after a softreset.
-                 * The _enable() function should be split to
-                 * avoid the rewrite of the OCP_SYSCONFIG register.
-                 */
-                if (oh->class->sysc) {
-                        _update_sysc_cache(oh);
-                        _enable_sysc(oh);
-                }
-        }
-
         postsetup_state = oh->_postsetup_state;
         if (postsetup_state == _HWMOD_STATE_UNKNOWN)
                 postsetup_state = _HWMOD_STATE_ENABLED;
@@ -1909,20 +1903,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);
 }
 
 /**
@@ -2465,26 +2449,28 @@ int omap_hwmod_del_initiator_dep(struct omap_hwmod *oh,
  * @oh: struct omap_hwmod *
  *
  * Sets the module OCP socket ENAWAKEUP bit to allow the module to
- * send wakeups to the PRCM.  Eventually this should sets PRCM wakeup
- * registers to cause the PRCM to receive wakeup events from the
- * module.  Does not set any wakeup routing registers beyond this
- * point - if the module is to wake up any other module or subsystem,
- * that must be set separately.  Called by omap_device code.  Returns
- * -EINVAL on error or 0 upon success.
+ * send wakeups to the PRCM, and enable I/O ring wakeup events for
+ * this IP block if it has dynamic mux entries.  Eventually this
+ * should set PRCM wakeup registers to cause the PRCM to receive
+ * wakeup events from the module.  Does not set any wakeup routing
+ * registers beyond this point - if the module is to wake up any other
+ * module or subsystem, that must be set separately.  Called by
+ * omap_device code.  Returns -EINVAL on error or 0 upon success.
  */
 int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)
 {
         unsigned long flags;
         u32 v;
 
-        if (!oh->class->sysc ||
-            !(oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP))
-                return -EINVAL;
-
         spin_lock_irqsave(&oh->_lock, flags);
-        v = oh->_sysc_cache;
-        _enable_wakeup(oh, &v);
-        _write_sysconfig(v, oh);
+
+        if (oh->class->sysc &&
+            (oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP)) {
+                v = oh->_sysc_cache;
+                _enable_wakeup(oh, &v);
+                _write_sysconfig(v, oh);
+        }
+
         _set_idle_ioring_wakeup(oh, true);
         spin_unlock_irqrestore(&oh->_lock, flags);
 
@@ -2496,26 +2482,28 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)
  * @oh: struct omap_hwmod *
  *
  * Clears the module OCP socket ENAWAKEUP bit to prevent the module
- * from sending wakeups to the PRCM.  Eventually this should clear
- * PRCM wakeup registers to cause the PRCM to ignore wakeup events
- * from the module.  Does not set any wakeup routing registers beyond
- * this point - if the module is to wake up any other module or
- * subsystem, that must be set separately.  Called by omap_device
- * code.  Returns -EINVAL on error or 0 upon success.
+ * from sending wakeups to the PRCM, and disable I/O ring wakeup
+ * events for this IP block if it has dynamic mux entries.  Eventually
+ * this should clear PRCM wakeup registers to cause the PRCM to ignore
+ * wakeup events from the module.  Does not set any wakeup routing
+ * registers beyond this point - if the module is to wake up any other
+ * module or subsystem, that must be set separately.  Called by
+ * omap_device code.  Returns -EINVAL on error or 0 upon success.
  */
 int omap_hwmod_disable_wakeup(struct omap_hwmod *oh)
 {
         unsigned long flags;
         u32 v;
 
-        if (!oh->class->sysc ||
-            !(oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP))
-                return -EINVAL;
-
         spin_lock_irqsave(&oh->_lock, flags);
-        v = oh->_sysc_cache;
-        _disable_wakeup(oh, &v);
-        _write_sysconfig(v, oh);
+
+        if (oh->class->sysc &&
+            (oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP)) {
+                v = oh->_sysc_cache;
+                _disable_wakeup(oh, &v);
+                _write_sysconfig(v, oh);
+        }
+
         _set_idle_ioring_wakeup(oh, false);
         spin_unlock_irqrestore(&oh->_lock, flags);