Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 407f9be4 authored by Simon Arlott's avatar Simon Arlott Committed by Stephen Warren
Browse files

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: default avatarChris Boot <bootc@bootc.net>
Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
Signed-off-by: default avatarDom Cobley <popcornmix@gmail.com>
Signed-off-by: default avatarDom Cobley <dc4@broadcom.com>
Signed-off-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 75fabc3f
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -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>;
		};
	};
};