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:
 "Device tree and bindings updates for 3.12.

  General additions of various on-chip and on-board peripherals on
  various platforms as support gets added.  Some of the bigger changes
  are:

   - Addition of (new) PCI-e support on Tegra.
   - More Tegra4 support, including PMC configuration for Dalmore.
   - Addition of a new board for Exynos4 (trats2) and more bindings for
     4x12 IP.
   - Addition of Allwinner A20 and A31 SoC and board files.
   - Move of the ST Ericsson device tree files to now use ste-* prefix.
   - More move of hardware description of shmobile platforms to DT.
   - Two new board dts files for Freescale MXs"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.
  ARM: at91/dt: sam9x5ek: add sound configuration
  ARM: at91/dt: sam9x5ek: enable SSC
  ARM: at91/dt: sam9x5ek: add WM8731 codec
  ARM: at91/dt: sam9x5: add SSC DMA parameters
  ARM: at91/dt: add at91rm9200 PQFP package version
  ARM: at91: at91rm9200: set default mmc0 pinctrl-names
  ARM: at91: at91sam9n12: correct pin number of gpio-key
  ARM: at91: at91sam9n12: add qt1070 support
  ARM: at91: at91sam9n12: add pinctrl of TWI
  ARM: at91: Add PMU support for sama5d3
  ARM: at91: at91sam9260: add missing pinctrl-names on mmc
  ARM: tegra: configure power off for Dalmore
  ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
  ARM: dts: add sdio blocks to bcm28155-ap board
  ARM: dts: align sdio numbers to HW definition
  ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
  ARM: sun7i: Add Allwinner A20 DTSI
  ...

1 files changed, 132 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 339d9b11721c..3b879e7c697c 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -38,6 +38,78 @@
                 interrupts = <1 9 0xf04>;
         };
 
+        gpio0: gpio@ffc40000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc40000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 4 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 0 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio1: gpio@ffc41000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc41000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 5 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 32 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio2: gpio@ffc42000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc42000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 6 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 64 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio3: gpio@ffc43000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc43000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 7 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 96 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio4: gpio@ffc44000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc44000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 8 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 128 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio5: gpio@ffc45000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc45000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 9 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 160 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
         timer {
                 compatible = "arm,armv7-timer";
                 interrupts = <1 13 0xf08>,
@@ -54,4 +126,64 @@
                 interrupt-parent = <&gic>;
                 interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>;
         };
+
+        mmcif0: mmcif@ee200000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee200000 0 0x80>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 169 0x4>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        mmcif1: mmcif@ee220000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee220000 0 0x80>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 170 0x4>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        pfc: pfc@e6060000 {
+                compatible = "renesas,pfc-r8a7790";
+                reg = <0 0xe6060000 0 0x250>;
+                #gpio-range-cells = <3>;
+        };
+
+        sdhi0: sdhi@ee100000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee100000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 165 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi1: sdhi@ee120000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee120000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 166 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi2: sdhi@ee140000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee140000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 167 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi3: sdhi@ee160000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee160000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 168 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
 };