Merge branch 'next/dt' into HEAD

Conflicts:
	Documentation/devicetree/bindings/usb/platform-uhci.txt
	arch/arm/mach-vt8500/bv07.c
	arch/arm/mach-vt8500/devices-vt8500.c
	arch/arm/mach-vt8500/devices-wm8505.c
	arch/arm/mach-vt8500/devices.c
	arch/arm/mach-vt8500/devices.h
	arch/arm/mach-vt8500/wm8505_7in.c

1 files changed, 48 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
new file mode 100644
index 000000000000..bfd76b4a0ddc
--- /dev/null
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -0,0 +1,48 @@
+/*
+ * Device Tree Source for OMAP2420 SoC
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/include/ "omap2.dtsi"
+
+/ {
+        compatible = "ti,omap2420", "ti,omap2";
+
+        ocp {
+                omap2420_pmx: pinmux@48000030 {
+                        compatible = "ti,omap2420-padconf", "pinctrl-single";
+                        reg = <0x48000030 0x0113>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        pinctrl-single,register-width = <8>;
+                        pinctrl-single,function-mask = <0x3f>;
+                };
+
+                mcbsp1: mcbsp@48074000 {
+                        compatible = "ti,omap2420-mcbsp";
+                        reg = <0x48074000 0xff>;
+                        reg-names = "mpu";
+                        interrupts = <59>, /* TX interrupt */
+                                     <60>; /* RX interrupt */
+                        interrupt-names = "tx", "rx";
+                        interrupt-parent = <&intc>;
+                        ti,hwmods = "mcbsp1";
+                };
+
+                mcbsp2: mcbsp@48076000 {
+                        compatible = "ti,omap2420-mcbsp";
+                        reg = <0x48076000 0xff>;
+                        reg-names = "mpu";
+                        interrupts = <62>, /* TX interrupt */
+                                     <63>; /* RX interrupt */
+                        interrupt-names = "tx", "rx";
+                        interrupt-parent = <&intc>;
+                        ti,hwmods = "mcbsp2";
+                };
+        };
+};