Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.3/soc

ARM: OMAP2+: PRCM and hwmod changes for v4.3

This series adds:

- I/O wakeup support for AM43xx
- register lock and unlock support to the hwmod code (needed for the RTC
  IP blocks on some chips)
- several fixes for sparse warnings and an unnecessary null pointer test
- a DRA7xx clockdomain configuration workaround, to deal with some hardware
  bugs

Basic build, boot, and PM tests are here:

http://www.pwsan.com/omap/testlogs/hwmod-prcm-for-v4.3/20150723080012/

Since I do not have an AM43xx or DRA7xx device, I can't test on those
platforms.

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index d78c12e7cb5e..2ceed3192f22 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -299,7 +299,20 @@ static void _write_sysconfig(u32 v, struct omap_hwmod *oh)
 
         /* Module might have lost context, always update cache and register */
         oh->_sysc_cache = v;
+
+        /*
+         * Some IP blocks (such as RTC) require unlocking of IP before
+         * accessing its registers. If a function pointer is present
+         * to unlock, then call it before accessing sysconfig and
+         * call lock after writing sysconfig.
+         */
+        if (oh->class->unlock)
+                oh->class->unlock(oh);
+
         omap_hwmod_write(v, oh, oh->class->sysc->sysc_offs);
+
+        if (oh->class->lock)
+                oh->class->lock(oh);
 }
 
 /**