---

yaml --- r: 326674 b: refs/heads/master c: 407f9be h: refs/heads/master v: v3
git-mirror · Sep 20, 2012 · a7a6fea · a7a6fea
1 parent 4eb3515
commit a7a6fea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75fabc3f64489aa2c52eec54cd433ea269a25e05
+refs/heads/master: 407f9be4544538674fb83a2d064a25428595c7ff
diff --git a/trunk/arch/arm/boot/dts/bcm2835.dtsi b/trunk/arch/arm/boot/dts/bcm2835.dtsi
@@ -6,7 +6,7 @@
 	interrupt-parent = <&intc>;
 
 	chosen {
-		bootargs = "earlyprintk";
+		bootargs = "earlyprintk console=ttyAMA0";
 	};
 
 	soc {
@@ -28,5 +28,12 @@
 			interrupt-controller;
 			#interrupt-cells = <2>;
 		};
+
+		uart@20201000 {
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+			reg = <0x7e201000 0x1000>;
+			interrupts = <2 25>;
+			clock-frequency = <3000000>;
+		};
 	};
 };