Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC fixes from Arnd Bergmann:
 -  multiple omap2+ bug fixes
 - a regression on ux500 dt support
 - a build failure on shmobile

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP2+: omap2plus_defconfig: EHCI driver is not stable, disable it
  ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=n
  ARM: ux500: Over-ride the DT device naming scheme for pinctrl
  ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set
  of: address: Don't fail a lookup just because a node has no reg property
  ARM: OMAP2+: hwmod code/clockdomain data: fix 32K sync timer

diff --combined drivers/of/platform.c
index 3132ea068d95fada8b01e85a49cfd5859d1c4b6c,96004807dd280e1a12e8427f36becc0090804da9..e44f8c2d239d253afc045164834f0476b94cf932
--- 1/drivers/of/platform.c
--- 2/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@@ -317,10 -317,9 +317,9 @@@ static const struct of_dev_auxdata *of_
        for(; lookup->compatible != NULL; lookup++) {
                if (!of_device_is_compatible(np, lookup->compatible))
                        continue;
-               if (of_address_to_resource(np, 0, &res))
-                       continue;
-               if (res.start != lookup->phys_addr)
-                       continue;
+               if (!of_address_to_resource(np, 0, &res))
+                       if (res.start != lookup->phys_addr)
+                               continue;
                pr_debug("%s: devname=%s\n", np->full_name, lookup->name);
                return lookup;
        }
@@@ -462,5 -461,4 +461,5 @@@ int of_platform_populate(struct device_
        of_node_put(root);
        return rc;
  }
 +EXPORT_SYMBOL_GPL(of_platform_populate);
  #endif /* CONFIG_OF_ADDRESS */