diff options
| author | Simon Arlott <simon@fire.lp0.eu> | 2012-09-10 23:29:17 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@wwwdotorg.org> | 2012-09-19 19:08:59 -0600 |
| commit | 407f9be4544538674fb83a2d064a25428595c7ff (patch) | |
| tree | 18968a2b9d338c631adc9ec95dde6549e2eb75ea /arch/arm | |
| parent | 75fabc3f64489aa2c52eec54cd433ea269a25e05 (diff) | |
| download | talos-obmc-linux-407f9be4544538674fb83a2d064a25428595c7ff.tar.gz talos-obmc-linux-407f9be4544538674fb83a2d064a25428595c7ff.zip | |
ARM: bcm2835: instantiate console UART
This patch was extracted from git://github.com/lp0/linux.git branch
rpi-split as of 2012/09/08, and modified as follows:
* s/bcm2708/bcm2835/.
* Modified device tree vendor prefix.
* Modified UART DT node to use a unit-address to create unique UART node
names, rather than using non-type names "uart0" and "uart1".
Note that UART 1 (the Broadcom "mini UART") is not yet present, but
I'm naming the DT node in anticipation that it will be added.
Signed-off-by: Chris Boot <bootc@bootc.net>
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Signed-off-by: Dom Cobley <dc4@broadcom.com>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/bcm2835.dtsi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index e7471d271e0f..0b619398532c 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/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>; + }; }; }; |
