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

Pull ARM SoC DT updates from Olof Johansson:
 "DT and DT-conversion-related changes for various ARM platforms.  Most
  of these are to enable various devices on various boards, etc, and not
  necessarily worth enumerating.

  New boards and systems continue to come in as new devicetree files
  that don't require corresponding C changes any more, which is
  indicating that the system is starting to work fairly well.

  A few things worth pointing out:

   * ST Ericsson ux500 platforms have made the major push to move over
     to fully support the platform with DT
   * Renesas platforms continue their conversion over from legacy
     platform devices to DT-based for hardware description"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (327 commits)
  ARM: dts: SiRF: add pin group for USP0 with only RX or TX frame sync
  ARM: dts: SiRF: add lost usp1_uart_nostreamctrl pin group for atlas6
  ARM: dts: sirf: add lost minigpsrtc device node
  ARM: dts: sirf: add clock, frequence-voltage table for CPU0
  ARM: dts: sirf: add lost bus_width, clock and status for sdhci
  ARM: dts: sirf: add lost clocks for cphifbg
  ARM: dts: socfpga: add pl330 clock
  ARM: dts: socfpga: update L2 tag and data latency
  arm: sun7i: cubietruck: Enable the i2c controllers
  ARM: dts: add support for EXYNOS4412 based TINY4412 board
  ARM: dts: Add initial support for Arndale Octa board
  ARM: bcm2835: add USB controller to device tree
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: dts: sun7i: external clock outputs
  ARM: dts: sun7i: Change 32768 Hz oscillator node name to clk@N style
  ARM: dts: sun7i: Add pin muxing options for clock outputs
  ARM: dts: sun7i: Add rtp controller node
  ARM: dts: sun5i: Add rtp controller node
  ARM: dts: sun4i: Add rtp controller node
  ...

diff --cc Documentation/devicetree/bindings/arm/atmel-at91.txt
Simple merge

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

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 80ffacd128f828be3439ddc9b52f7139db6471e4,b6b253924893fffb88b21e7271653d5eb690d56e..74b5964430ac3a7d833d8fce12eb655746acba4b
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -183,13 -236,12 +236,12 @@@
                                status = "disabled";
                        };
  
-                       i2c0: i2c@11000 {
-                               compatible = "marvell,mv64xxx-i2c";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               interrupts = <31>;
-                               timeout-ms = <1000>;
-                               clocks = <&coreclk 0>;
+                       sata@a0000 {
 -                              compatible = "marvell,orion-sata";
++                              compatible = "marvell,armada-370-sata";
+                               reg = <0xa0000 0x5000>;
+                               interrupts = <55>;
+                               clocks = <&gateclk 15>, <&gateclk 30>;
+                               clock-names = "0", "1";
                                status = "disabled";
                        };
  

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

diff --cc arch/arm/boot/dts/r8a7790.dtsi
index 9987dd0e9c599929042b1ce70d4b1d6c3ec1ebfb,a1791250bf4b354148961f867568a5879ff0cd43..f48487c2a970aa6020d7400dfa3fbc2c710855cc
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -84,14 -88,14 +88,14 @@@
                        <0 0xf1002000 0 0x1000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
-               interrupts = <1 9 0xf04>;
+               interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
        };
  
 -      gpio0: gpio@ffc40000 {
 +      gpio0: gpio@e6050000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc40000 0 0x2c>;
 +              reg = <0 0xe6050000 0 0x50>;
                interrupt-parent = <&gic>;
-               interrupts = <0 4 0x4>;
+               interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 0 32>;
@@@ -99,11 -103,11 +103,11 @@@
                interrupt-controller;
        };
  
 -      gpio1: gpio@ffc41000 {
 +      gpio1: gpio@e6051000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc41000 0 0x2c>;
 +              reg = <0 0xe6051000 0 0x50>;
                interrupt-parent = <&gic>;
-               interrupts = <0 5 0x4>;
+               interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 32 32>;
@@@ -111,11 -115,11 +115,11 @@@
                interrupt-controller;
        };
  
 -      gpio2: gpio@ffc42000 {
 +      gpio2: gpio@e6052000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc42000 0 0x2c>;
 +              reg = <0 0xe6052000 0 0x50>;
                interrupt-parent = <&gic>;
-               interrupts = <0 6 0x4>;
+               interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 64 32>;
@@@ -123,11 -127,11 +127,11 @@@
                interrupt-controller;
        };
  
 -      gpio3: gpio@ffc43000 {
 +      gpio3: gpio@e6053000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc43000 0 0x2c>;
 +              reg = <0 0xe6053000 0 0x50>;
                interrupt-parent = <&gic>;
-               interrupts = <0 7 0x4>;
+               interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 96 32>;
@@@ -135,11 -139,11 +139,11 @@@
                interrupt-controller;
        };
  
 -      gpio4: gpio@ffc44000 {
 +      gpio4: gpio@e6054000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc44000 0 0x2c>;
 +              reg = <0 0xe6054000 0 0x50>;
                interrupt-parent = <&gic>;
-               interrupts = <0 8 0x4>;
+               interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 128 32>;
@@@ -147,11 -151,11 +151,11 @@@
                interrupt-controller;
        };
  
 -      gpio5: gpio@ffc45000 {
 +      gpio5: gpio@e6055000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc45000 0 0x2c>;
 +              reg = <0 0xe6055000 0 0x50>;
                interrupt-parent = <&gic>;
-               interrupts = <0 9 0x4>;
+               interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 160 32>;
@@@ -239,20 -259,22 +259,22 @@@
                reg = <0 0xe6060000 0 0x250>;
        };
  
-       sdhi0: sdhi@ee100000 {
+       sdhi0: sd@ee100000 {
                compatible = "renesas,sdhi-r8a7790";
 -              reg = <0 0xee100000 0 0x100>;
 +              reg = <0 0xee100000 0 0x200>;
                interrupt-parent = <&gic>;
-               interrupts = <0 165 4>;
+               interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
                cap-sd-highspeed;
                status = "disabled";
        };
  
-       sdhi1: sdhi@ee120000 {
+       sdhi1: sd@ee120000 {
                compatible = "renesas,sdhi-r8a7790";
 -              reg = <0 0xee120000 0 0x100>;
 +              reg = <0 0xee120000 0 0x200>;
                interrupt-parent = <&gic>;
-               interrupts = <0 166 4>;
+               interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
                cap-sd-highspeed;
                status = "disabled";
        };

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

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

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

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

diff --cc arch/arm/boot/dts/tegra20-colibri-512.dtsi
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7778.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7790.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-audio.c
Simple merge

diff --cc arch/arm/mach-ux500/setup.h
Simple merge

diff --cc drivers/clocksource/nomadik-mtu.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge