Merge tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm...

Pull "ARM: OMAP2+: DRA72x/DRA74x basic support" from Tony Lindgren:

Add basic subarchitecture support for the DRA72x and DRA74x.  These
are OMAP2+ derivative SoCs.  This should be low-risk to existing OMAP
platforms.

Basic build, boot, and PM test logs are available here:

http://www.pwsan.com/omap/testlogs/hwmod-a-early-v3.17-rc/20140827194314/

* tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
  ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
  ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/mach-omap2/omap_hwmod.c
index da1b256cacccdd31c3bb01a0696530ccf2bd96de,bc2466cc33b96e105e37468317ea77d11ddef0a5..8fd87a3055bf6c4a084a25a51f19e4263567add7
--- 1/arch/arm/mach-omap2/omap_hwmod.c
--- 2/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@@ -2185,8 -2185,6 +2185,8 @@@ static int _enable(struct omap_hwmod *o
                         oh->mux->pads_dynamic))) {
                omap_hwmod_mux(oh->mux, _HWMOD_STATE_ENABLED);
                _reconfigure_io_chain();
 +      } else if (oh->flags & HWMOD_FORCE_MSTANDBY) {
 +              _reconfigure_io_chain();
        }
  
        _add_initiator_dep(oh, mpu_oh);
@@@ -2293,8 -2291,6 +2293,8 @@@ static int _idle(struct omap_hwmod *oh
        if (oh->mux && oh->mux->pads_dynamic) {
                omap_hwmod_mux(oh->mux, _HWMOD_STATE_IDLE);
                _reconfigure_io_chain();
 +      } else if (oh->flags & HWMOD_FORCE_MSTANDBY) {
 +              _reconfigure_io_chain();
        }
  
        oh->_state = _HWMOD_STATE_IDLE;
@@@ -3349,6 -3345,9 +3349,9 @@@ int __init omap_hwmod_register_links(st
        if (!ois)
                return 0;
  
+       if (ois[0] == NULL) /* Empty list */
+               return 0;
+ 
        if (!linkspace) {
                if (_alloc_linkspace(ois)) {
                        pr_err("omap_hwmod: could not allocate link space\n");