4 files changed, 29 insertions, 11 deletions

diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index a9d98d5ade9a..c38cf76df81f 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -7,11 +7,11 @@
  */
 /dts-v1/;
 
-/include/ "omap3.dtsi"
+/include/ "omap36xx.dtsi"
 
 / {
-        model = "TI OMAP3 BeagleBoard";
-        compatible = "ti,omap3-beagle", "ti,omap3";
+        model = "TI OMAP3 BeagleBoard xM";
+        compatible = "ti,omap3-beagle-xm, ti,omap3-beagle", "ti,omap3";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index f024bb3034a6..05c26c4f6606 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -17,7 +17,6 @@
                 serial0 = &uart1;
                 serial1 = &uart2;
                 serial2 = &uart3;
-                serial3 = &uart4;
         };
 
         cpus {
@@ -141,12 +140,6 @@
                         clock-frequency = <48000000>;
                 };
 
-                uart4: serial@49042000 {
-                        compatible = "ti,omap3-uart";
-                        ti,hwmods = "uart4";
-                        clock-frequency = <48000000>;
-                };
-
                 i2c1: i2c@48070000 {
                         compatible = "ti,omap3-i2c";
                         #address-cells = <1>;
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
new file mode 100644
index 000000000000..96bf0287cb9f
--- /dev/null
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -0,0 +1,25 @@
+/*
+ * Device Tree Source for OMAP3 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/ "omap3.dtsi"
+
+/ {
+        aliases {
+                serial3 = &uart4;
+        };
+
+        ocp {
+                uart4: serial@49042000 {
+                        compatible = "ti,omap3-uart";
+                        ti,hwmods = "uart4";
+                        clock-frequency = <48000000>;
+                };
+        };
+};
diff --git a/arch/arm/mach-omap2/Makefile.boot b/arch/arm/mach-omap2/Makefile.boot
index 18813ab1bb3c..be0fe9226d67 100644
--- a/arch/arm/mach-omap2/Makefile.boot
+++ b/arch/arm/mach-omap2/Makefile.boot
@@ -3,7 +3,7 @@ params_phys-y		:= 0x80000100
 initrd_phys-y           := 0x80800000
 
 dtb-$(CONFIG_SOC_OMAP2420)      += omap2420-h4.dtb
-dtb-$(CONFIG_ARCH_OMAP3)        += omap3-beagle.dtb omap3-evm.dtb omap3-tobi.dtb
+dtb-$(CONFIG_ARCH_OMAP3)        += omap3-beagle-xm.dtb omap3-evm.dtb omap3-tobi.dtb
 dtb-$(CONFIG_ARCH_OMAP4)        += omap4-panda.dtb omap4-pandaES.dtb
 dtb-$(CONFIG_ARCH_OMAP4)        += omap4-var_som.dtb omap4-sdp.dtb
 dtb-$(CONFIG_SOC_OMAP5)         += omap5-evm.dtb