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

Pull ARM soc device tree updates from Olof Johansson:
 "Device tree conversion and enablement branch.  Mostly a bunch of new
  bindings and setup for various platforms, but the Via/Winchip VT8500
  platform is also converted over from being 100% legacy to now use
  device tree for probing.  More of that will come for 3.8."

Trivial conflicts due to removal of vt8500 files, and one documentation
file that was added with slightly different contents both here and in
the USb tree.

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (212 commits)
  arm: vt8500: Fixup for missing gpio.h
  ARM: LPC32xx: LED fix in PHY3250 DTS file
  ARM: dt: mmp-dma: add binding file
  arm: vt8500: Update arch-vt8500 to devicetree support.
  arm: vt8500: gpio: Devicetree support for arch-vt8500
  arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
  arm: vt8500: clk: Add Common Clock Framework support
  video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
  serial: vt8500: Add devicetree support for vt8500-serial
  rtc: vt8500: Add devicetree support for vt8500-rtc
  arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
  ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
  ARM: tegra: Add Avionic Design Medcom-Wide support
  ARM: tegra: Add Avionic Design Plutux support
  ARM: tegra: Add Avionic Design Tamonten support
  ARM: tegra: dts: Add pwm label
  ARM: ux500: Fix SSP register address format
  ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT
  ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT
  ARM: ux500: Add all encompassing sound node to the HREF Device Tree
  ...

1 files changed, 61 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index bd0cff3f808c..bb31bff01998 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -69,95 +69,146 @@
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <1>;
+                        reg = <0x44e07000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <96>;
                 };
 
-                gpio2: gpio@4804C000 {
+                gpio2: gpio@4804c000 {
                         compatible = "ti,omap4-gpio";
                         ti,hwmods = "gpio2";
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <1>;
+                        reg = <0x4804c000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <98>;
                 };
 
-                gpio3: gpio@481AC000 {
+                gpio3: gpio@481ac000 {
                         compatible = "ti,omap4-gpio";
                         ti,hwmods = "gpio3";
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <1>;
+                        reg = <0x481ac000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <32>;
                 };
 
-                gpio4: gpio@481AE000 {
+                gpio4: gpio@481ae000 {
                         compatible = "ti,omap4-gpio";
                         ti,hwmods = "gpio4";
                         gpio-controller;
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <1>;
+                        reg = <0x481ae000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <62>;
                 };
 
-                uart1: serial@44E09000 {
+                uart1: serial@44e09000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart1";
                         clock-frequency = <48000000>;
+                        reg = <0x44e09000 0x2000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <72>;
+                        status = "disabled";
                 };
 
                 uart2: serial@48022000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart2";
                         clock-frequency = <48000000>;
+                        reg = <0x48022000 0x2000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <73>;
+                        status = "disabled";
                 };
 
                 uart3: serial@48024000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart3";
                         clock-frequency = <48000000>;
+                        reg = <0x48024000 0x2000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <74>;
+                        status = "disabled";
                 };
 
-                uart4: serial@481A6000 {
+                uart4: serial@481a6000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart4";
                         clock-frequency = <48000000>;
+                        reg = <0x481a6000 0x2000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <44>;
+                        status = "disabled";
                 };
 
-                uart5: serial@481A8000 {
+                uart5: serial@481a8000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart5";
                         clock-frequency = <48000000>;
+                        reg = <0x481a8000 0x2000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <45>;
+                        status = "disabled";
                 };
 
-                uart6: serial@481AA000 {
+                uart6: serial@481aa000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart6";
                         clock-frequency = <48000000>;
+                        reg = <0x481aa000 0x2000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <46>;
+                        status = "disabled";
                 };
 
-                i2c1: i2c@44E0B000 {
+                i2c1: i2c@44e0b000 {
                         compatible = "ti,omap4-i2c";
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c1";
+                        reg = <0x44e0b000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <70>;
+                        status = "disabled";
                 };
 
-                i2c2: i2c@4802A000 {
+                i2c2: i2c@4802a000 {
                         compatible = "ti,omap4-i2c";
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c2";
+                        reg = <0x4802a000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <71>;
+                        status = "disabled";
                 };
 
-                i2c3: i2c@4819C000 {
+                i2c3: i2c@4819c000 {
                         compatible = "ti,omap4-i2c";
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c3";
+                        reg = <0x4819c000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <30>;
+                        status = "disabled";
                 };
 
                 wdt2: wdt@44e35000 {
                         compatible = "ti,omap3-wdt";
                         ti,hwmods = "wd_timer2";
+                        reg = <0x44e35000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <91>;
                 };
         };
 };