aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/broadcom
diff options
context:
space:
mode:
authorJon Mason <jon.mason@broadcom.com>2016-05-11 18:56:08 -0400
committerFlorian Fainelli <f.fainelli@gmail.com>2016-05-31 14:00:27 -0400
commit1e0fdee81e24226dc6805aad00902f9d71c8e28c (patch)
tree9cf4bb97e6c59286009966ca64ea97ec1a3638e0 /arch/arm64/boot/dts/broadcom
parent5f2fb24141b948a3d91f249c7416262362496e54 (diff)
arm64: dts: NS2: Add all of the UARTs
Add all of the UARTs present on NS2 and enable them in the SVK device tree file. Also, do some magic to make sure that uart3 is discovered as ttyS0 (as that is the console UART). Signed-off-by: Jon Mason <jonmason@broadcom.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm64/boot/dts/broadcom')
-rw-r--r--arch/arm64/boot/dts/broadcom/ns2-svk.dts16
-rw-r--r--arch/arm64/boot/dts/broadcom/ns2.dtsi30
2 files changed, 46 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts
index 7cd364087385..b062a44a39c7 100644
--- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts
+++ b/arch/arm64/boot/dts/broadcom/ns2-svk.dts
@@ -40,10 +40,14 @@
40 40
41 aliases { 41 aliases {
42 serial0 = &uart3; 42 serial0 = &uart3;
43 serial1 = &uart0;
44 serial2 = &uart1;
45 serial3 = &uart2;
43 }; 46 };
44 47
45 chosen { 48 chosen {
46 stdout-path = "serial0:115200n8"; 49 stdout-path = "serial0:115200n8";
50 bootargs = "earlycon=uart8250,mmio32,0x66130000";
47 }; 51 };
48 52
49 memory { 53 memory {
@@ -68,6 +72,18 @@
68 status = "ok"; 72 status = "ok";
69}; 73};
70 74
75&uart0 {
76 status = "ok";
77};
78
79&uart1 {
80 status = "ok";
81};
82
83&uart2 {
84 status = "ok";
85};
86
71&uart3 { 87&uart3 {
72 status = "ok"; 88 status = "ok";
73}; 89};
diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi
index 788ed8f9f2bc..c77a9e86e9f8 100644
--- a/arch/arm64/boot/dts/broadcom/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi
@@ -357,6 +357,36 @@
357 status = "disabled"; 357 status = "disabled";
358 }; 358 };
359 359
360 uart0: serial@66100000 {
361 compatible = "snps,dw-apb-uart";
362 reg = <0x66100000 0x100>;
363 interrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>;
364 clocks = <&iprocslow>;
365 reg-shift = <2>;
366 reg-io-width = <4>;
367 status = "disabled";
368 };
369
370 uart1: serial@66110000 {
371 compatible = "snps,dw-apb-uart";
372 reg = <0x66110000 0x100>;
373 interrupts = <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>;
374 clocks = <&iprocslow>;
375 reg-shift = <2>;
376 reg-io-width = <4>;
377 status = "disabled";
378 };
379
380 uart2: serial@66120000 {
381 compatible = "snps,dw-apb-uart";
382 reg = <0x66120000 0x100>;
383 interrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>;
384 clocks = <&iprocslow>;
385 reg-shift = <2>;
386 reg-io-width = <4>;
387 status = "disabled";
388 };
389
360 uart3: serial@66130000 { 390 uart3: serial@66130000 {
361 compatible = "snps,dw-apb-uart"; 391 compatible = "snps,dw-apb-uart";
362 reg = <0x66130000 0x100>; 392 reg = <0x66130000 0x100>;