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

Pull ARM SoC fixes from Olof Johansson:
 "This is a batch of fixes for arm-soc platforms, most of it is for OMAP
  but there are others too (i.MX, Tegra, ep93xx).  Fixes warnings, some
  broken platforms and drivers, etc.  A bit all over the map really."

There was some concern about commit 68136b10 ("RM: sunxi: Change device
tree naming scheme for sunxi"), but Tony says:
 "Looks like that's trivial to fix as needed, no need to rebuild the
  branch to fix that AFAIK.

  The fix can be done once Olof is available online again.

  Linus, I suggest that you go ahead and pull this if there are no other
  issues with this branch."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
  ARM: sunxi: Change device tree naming scheme for sunxi
  ARM: ux500: fix missing include
  ARM: u300: delete custom pin hog code
  ARM: davinci: fix build break due to missing include
  ARM: exynos: Fix warning due to missing 'inline' in stub
  ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
  ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
  ARM: dts: mx27: Fix the AIPI bus for FEC
  ARM: OMAP2+: common: remove use of vram
  ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings
  ARM: OMAP4: clock data: DPLLs are missing bypass clocks in their parent lists
  ARM: OMAP4: clock data: div_iva_hs_clk is a power-of-two divider
  ARM: OMAP4: Fix EMU clock domain always on
  ARM: OMAP4460: Workaround ABE DPLL failing to turn-on
  ARM: OMAP4: Enhance support for DPLLs with 4X multiplier
  ARM: OMAP4: Add function table for non-M4X dplls
  ARM: OMAP4: Update timer clock aliases
  ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
  ARM: dts: Add build target for omap4-panda-a4
  ARM: dts: OMAP2420: Correct H4 board memory size
  ...

diff --combined arch/arm/mach-u300/core.c
index 8b204ae6900212524791908db1b215a82654bb09,0374b9863e9ba40ae209895169597900c018c271..4ce77cdc31ccc944765640fe269bd656ca8f619b
--- 1/arch/arm/mach-u300/core.c
--- 2/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@@ -27,7 -27,6 +27,6 @@@
  #include <linux/mtd/nand.h>
  #include <linux/mtd/fsmc.h>
  #include <linux/pinctrl/machine.h>
- #include <linux/pinctrl/consumer.h>
  #include <linux/pinctrl/pinconf-generic.h>
  #include <linux/dma-mapping.h>
  #include <linux/platform_data/clk-u300.h>
@@@ -249,18 -248,6 +248,18 @@@ static struct resource rtc_resources[] 
   * but these are not yet used by the driver.
   */
  static struct resource fsmc_resources[] = {
 +      {
 +              .name  = "nand_addr",
 +              .start = U300_NAND_CS0_PHYS_BASE + PLAT_NAND_ALE,
 +              .end   = U300_NAND_CS0_PHYS_BASE + PLAT_NAND_ALE + SZ_16K - 1,
 +              .flags = IORESOURCE_MEM,
 +      },
 +      {
 +              .name  = "nand_cmd",
 +              .start = U300_NAND_CS0_PHYS_BASE + PLAT_NAND_CLE,
 +              .end   = U300_NAND_CS0_PHYS_BASE + PLAT_NAND_CLE + SZ_16K - 1,
 +              .flags = IORESOURCE_MEM,
 +      },
        {
                .name  = "nand_data",
                .start = U300_NAND_CS0_PHYS_BASE,
@@@ -1504,6 -1491,8 +1503,6 @@@ static struct fsmc_nand_platform_data n
        .nr_partitions = ARRAY_SIZE(u300_partitions),
        .options = NAND_SKIP_BBTSCAN,
        .width = FSMC_NAND_BW8,
 -      .ale_off = PLAT_NAND_ALE,
 -      .cle_off = PLAT_NAND_CLE,
  };
  
  static struct platform_device nand_device = {
@@@ -1553,39 -1542,6 +1552,6 @@@ static struct pinctrl_map __initdata u3
                                    pin_highz_conf),
  };
  
- struct u300_mux_hog {
-       struct device *dev;
-       struct pinctrl *p;
- };
- 
- static struct u300_mux_hog u300_mux_hogs[] = {
-       {
-               .dev = &uart0_device.dev,
-       },
-       {
-               .dev = &mmcsd_device.dev,
-       },
- };
- 
- static int __init u300_pinctrl_fetch(void)
- {
-       int i;
- 
-       for (i = 0; i < ARRAY_SIZE(u300_mux_hogs); i++) {
-               struct pinctrl *p;
- 
-               p = pinctrl_get_select_default(u300_mux_hogs[i].dev);
-               if (IS_ERR(p)) {
-                       pr_err("u300: could not get pinmux hog for dev %s\n",
-                              dev_name(u300_mux_hogs[i].dev));
-                       continue;
-               }
-               u300_mux_hogs[i].p = p;
-       }
-       return 0;
- }
- subsys_initcall(u300_pinctrl_fetch);
- 
  /*
   * Notice that AMBA devices are initialized before platform devices.
   *