3 files changed, 14 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 82651c3eb682..b8565fc33eea 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -18,12 +18,9 @@
         compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
         model = "Raspberry Pi Zero W";
 
-        /* Needed by firmware to properly init UARTs */
-        aliases {
-                uart0 = "/soc/serial@7e201000";
-                uart1 = "/soc/serial@7e215040";
-                serial0 = "/soc/serial@7e201000";
-                serial1 = "/soc/serial@7e215040";
+        chosen {
+                /* 8250 auxiliary UART instead of pl011 */
+                stdout-path = "serial1:115200n8";
         };
 
         leds {
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 20725ca487f3..c71a0d73d2a2 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -8,6 +8,11 @@
         compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
         model = "Raspberry Pi 3 Model B";
 
+        chosen {
+                /* 8250 auxiliary UART instead of pl011 */
+                stdout-path = "serial1:115200n8";
+        };
+
         memory {
                 reg = <0 0x40000000>;
         };
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 431dcfc900c0..013431e3d7c3 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -20,8 +20,13 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                serial0 = &uart0;
+                serial1 = &uart1;
+        };
+
         chosen {
-                bootargs = "earlyprintk console=ttyAMA0";
+                stdout-path = "serial0:115200n8";
         };
 
         thermal-zones {