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

Pull ARM SoC device tree updates (part 2) from Arnd Bergmann:
 "These are mostly new device tree bindings for existing drivers, as
  well as changes to the device tree source files to add support for
  those devices, and a couple of new boards, most notably Samsung's
  Exynos5 based Chromebook.

  The changes depend on earlier platform specific updates and touch the
  usual platforms: omap, exynos, tegra, mxs, mvebu and davinci."

* tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)
  ARM: exynos: dts: cros5250: add EC device
  ARM: dts: Add sbs-battery for exynos5250-snow
  ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
  ARM: dts: add mshc controller node for Exynos4x12 SoCs
  ARM: dts: Add chip-id controller node on Exynos4/5 SoC
  ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
  ARM: davinci: da850-evm: add SPI flash support
  ARM: davinci: da850: override SPI DT node device name
  ARM: davinci: da850: add SPI1 DT node
  spi/davinci: add DT binding documentation
  spi/davinci: no wildcards in DT compatible property
  ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
  ARM: dts: mvebu: introduce internal-regs node
  ARM: dts: mvebu: Convert all the mvebu files to use the range property
  ARM: dts: mvebu: move all peripherals inside soc
  ARM: dts: mvebu: fix cpus section indentation
  ARM: davinci: da850: add EHRPWM & ECAP DT node
  ARM/dts: OMAP3: fix pinctrl-single configuration
  ARM: dts: Add OMAP3430 SDP NOR flash memory binding
  ARM: dts: Add NOR flash bindings for OMAP2420 H4
  ...

diff --cc Documentation/devicetree/bindings/gpio/gpio-omap.txt
Simple merge

diff --cc Documentation/devicetree/bindings/usb/omap-usb.txt
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4210.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4412-origen.dts
Simple merge

diff --cc arch/arm/boot/dts/exynos5250.dtsi
index 28758e5,53c37f0..98dfc3e
--- 1/arch/arm/boot/dts/exynos5250.dtsi
--- 2/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@@ -109,12 -131,36 +131,42 @@@
                };
        };
  
 +      pmu {
 +              compatible = "arm,cortex-a15-pmu";
 +              interrupt-parent = <&combiner>;
 +              interrupts = <1 2>, <22 4>;
 +      };
 +
+       pinctrl_0: pinctrl@11400000 {
+               compatible = "samsung,exynos5250-pinctrl";
+               reg = <0x11400000 0x1000>;
+               interrupts = <0 46 0>;
+ 
+               wakup_eint: wakeup-interrupt-controller {
+                       compatible = "samsung,exynos4210-wakeup-eint";
+                       interrupt-parent = <&gic>;
+                       interrupts = <0 32 0>;
+               };
+       };
+ 
+       pinctrl_1: pinctrl@13400000 {
+               compatible = "samsung,exynos5250-pinctrl";
+               reg = <0x13400000 0x1000>;
+               interrupts = <0 45 0>;
+       };
+ 
+       pinctrl_2: pinctrl@10d10000 {
+               compatible = "samsung,exynos5250-pinctrl";
+               reg = <0x10d10000 0x1000>;
+               interrupts = <0 50 0>;
+       };
+ 
+       pinctrl_3: pinctrl@03680000 {
+               compatible = "samsung,exynos5250-pinctrl";
+               reg = <0x0368000 0x1000>;
+               interrupts = <0 47 0>;
+       };
+ 
        watchdog {
                compatible = "samsung,s3c2410-wdt";
                reg = <0x101D0000 0x100>;

diff --cc arch/arm/boot/dts/exynos5440.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx6qdl.dtsi
Simple merge

diff --cc arch/arm/mach-davinci/da8xx-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/include/mach/map.h
Simple merge

diff --cc arch/arm/mach-mxs/mach-mxs.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
index 93f213b,39771c1..d25a95f
--- 1/arch/arm/mach-omap2/omap_hwmod.c
--- 2/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@@ -138,7 -138,8 +138,9 @@@
  #include <linux/spinlock.h>
  #include <linux/slab.h>
  #include <linux/bootmem.h>
 +#include <linux/cpu.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
  
  #include <asm/system_misc.h>
  
@@@ -2410,10 -2448,11 +2449,11 @@@ static int __init _init(struct omap_hwm
        if (oh->_state != _HWMOD_STATE_REGISTERED)
                return 0;
  
-       _init_mpu_rt_base(oh, NULL);
+       if (oh->class->sysc)
+               _init_mpu_rt_base(oh, NULL);
  
        r = _init_clocks(oh, NULL);
 -      if (IS_ERR_VALUE(r)) {
 +      if (r < 0) {
                WARN(1, "omap_hwmod: %s: couldn't init clocks\n", oh->name);
                return -EINVAL;
        }

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/plat-omap/dmtimer.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mxs.c
Simple merge

diff --cc drivers/mmc/host/mxs-mmc.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec.h
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
index b9748f1,cb5783d..e25bf83
--- 1/drivers/net/ethernet/freescale/fec_main.c
--- 2/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@@ -1962,12 -1901,15 +1967,12 @@@ failed_irq
  failed_regulator:
        clk_disable_unprepare(fep->clk_ahb);
        clk_disable_unprepare(fep->clk_ipg);
-       if (!IS_ERR(fep->clk_ptp))
-               clk_disable_unprepare(fep->clk_ptp);
+       clk_disable_unprepare(fep->clk_enet_out);
+       clk_disable_unprepare(fep->clk_ptp);
  failed_pin:
  failed_clk:
 -      iounmap(fep->hwp);
  failed_ioremap:
        free_netdev(ndev);
 -failed_alloc_etherdev:
 -      release_mem_region(r->start, resource_size(r));
  
        return ret;
  }

diff --cc drivers/spi/spi-mxs.c
index a1d5778,7b1c014..8498276
--- 1/drivers/spi/spi-mxs.c
--- 2/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@@ -606,13 -567,9 +567,10 @@@ static int mxs_spi_probe(struct platfor
        if (ret)
                goto out_master_free;
  
-       dma_cap_zero(mask);
-       dma_cap_set(DMA_SLAVE, mask);
-       ssp->dma_data.chan_irq = irq_dma;
-       ssp->dmach = dma_request_channel(mask, mxs_ssp_dma_filter, ssp);
+       ssp->dmach = dma_request_slave_channel(&pdev->dev, "rx-tx");
        if (!ssp->dmach) {
                dev_err(ssp->dev, "Failed to request DMA\n");
 +              ret = -ENODEV;
                goto out_master_free;
        }
  

diff --cc drivers/tty/serial/mxs-auart.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge