From abe02486e508742273a68c14d38e99c77b85864a Mon Sep 17 00:00:00 2001
From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 15 Mar 2012 01:00:27 +0000
Subject: [PATCH] --- yaml --- r: 296722 b: refs/heads/master c:
 163f2cea673a4ae831ad2cd26d8f01977c3add93 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../arch/arm/boot/dts/kirkwood-dreamplug.dts  | 11 ++++----
 trunk/arch/arm/boot/dts/kirkwood.dtsi         | 26 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2e62f2055c25..4f90825eec43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fa6b8781fbd5e6cd5e313c5e3bdd73b426d8f30
+refs/heads/master: 163f2cea673a4ae831ad2cd26d8f01977c3add93
diff --git a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 333f11b85504..a5376b84227f 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -15,11 +15,10 @@
 		bootargs = "console=ttyS0,115200n8 earlyprintk";
 	};
 
-	serial@f1012000 {
-		compatible = "ns16550a";
-		reg = <0xf1012000 0x100>;
-		reg-shift = <2>;
-		interrupts = <33>;
-		clock-frequency = <200000000>;
+	ocp@f1000000 {
+		serial@12000 {
+			clock-frequency = <200000000>;
+			status = "ok";
+		};
 	};
 };
diff --git a/trunk/arch/arm/boot/dts/kirkwood.dtsi b/trunk/arch/arm/boot/dts/kirkwood.dtsi
index 702b9555d019..825310b6d366 100644
--- a/trunk/arch/arm/boot/dts/kirkwood.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood.dtsi
@@ -2,5 +2,29 @@
 
 / {
 	compatible = "mrvl,kirkwood";
-};
 
+	ocp@f1000000 {
+		compatible = "simple-bus";
+		ranges = <0 0xf1000000 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		serial@12000 {
+			compatible = "ns16550a";
+			reg = <0x12000 0x100>;
+			reg-shift = <2>;
+			interrupts = <33>;
+			/* set clock-frequency in board dts */
+			status = "disabled";
+		};
+
+		serial@12100 {
+			compatible = "ns16550a";
+			reg = <0x12100 0x100>;
+			reg-shift = <2>;
+			interrupts = <34>;
+			/* set clock-frequency in board dts */
+			status = "disabled";
+		};
+	};
+};