From 222484e4470588361f50750026303886c3ebe944 Mon Sep 17 00:00:00 2001
From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Wed, 15 Aug 2012 16:53:25 +0530
Subject: [PATCH] --- yaml --- r: 326811 b: refs/heads/master c:
 53d91034cf29936cabf9a4d59270dc94ed7e6c1d h: refs/heads/master i:   326809:
 773536bed60b153d074dd541a1db386f4b2348c5   326807:
 ec95d57dcd748256146749d440a087731c29aec4 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/boot/dts/am335x-bone.dts | 6 ++++++
 trunk/arch/arm/boot/dts/am335x-evm.dts  | 6 ++++++
 trunk/arch/arm/boot/dts/am33xx.dtsi     | 9 +++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c24f55c95da..07c96278f9e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dd18b0150e6f4eb3a9d06a2621cad8c73a3eccf
+refs/heads/master: 53d91034cf29936cabf9a4d59270dc94ed7e6c1d
diff --git a/trunk/arch/arm/boot/dts/am335x-bone.dts b/trunk/arch/arm/boot/dts/am335x-bone.dts
index a9af4db7234c..a7906cb7989f 100644
--- a/trunk/arch/arm/boot/dts/am335x-bone.dts
+++ b/trunk/arch/arm/boot/dts/am335x-bone.dts
@@ -17,4 +17,10 @@
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
+
+	ocp {
+		uart1: serial@44E09000 {
+			status = "okay";
+		};
+	};
 };
diff --git a/trunk/arch/arm/boot/dts/am335x-evm.dts b/trunk/arch/arm/boot/dts/am335x-evm.dts
index d6a97d9eff72..5dd8a6b9f194 100644
--- a/trunk/arch/arm/boot/dts/am335x-evm.dts
+++ b/trunk/arch/arm/boot/dts/am335x-evm.dts
@@ -17,4 +17,10 @@
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
+
+	ocp {
+		uart1: serial@44E09000 {
+			status = "okay";
+		};
+	};
 };
diff --git a/trunk/arch/arm/boot/dts/am33xx.dtsi b/trunk/arch/arm/boot/dts/am33xx.dtsi
index 59509c48d7e5..5f6c8e33060f 100644
--- a/trunk/arch/arm/boot/dts/am33xx.dtsi
+++ b/trunk/arch/arm/boot/dts/am33xx.dtsi
@@ -102,36 +102,42 @@
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart1";
 			clock-frequency = <48000000>;
+			status = "disabled";
 		};
 
 		uart2: serial@48022000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart2";
 			clock-frequency = <48000000>;
+			status = "disabled";
 		};
 
 		uart3: serial@48024000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart3";
 			clock-frequency = <48000000>;
+			status = "disabled";
 		};
 
 		uart4: serial@481A6000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart4";
 			clock-frequency = <48000000>;
+			status = "disabled";
 		};
 
 		uart5: serial@481A8000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart5";
 			clock-frequency = <48000000>;
+			status = "disabled";
 		};
 
 		uart6: serial@481AA000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart6";
 			clock-frequency = <48000000>;
+			status = "disabled";
 		};
 
 		i2c1: i2c@44E0B000 {
@@ -139,6 +145,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			ti,hwmods = "i2c1";
+			status = "disabled";
 		};
 
 		i2c2: i2c@4802A000 {
@@ -146,6 +153,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			ti,hwmods = "i2c2";
+			status = "disabled";
 		};
 
 		i2c3: i2c@4819C000 {
@@ -153,6 +161,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			ti,hwmods = "i2c3";
+			status = "disabled";
 		};
 	};
 };