diff options
| author | Florian Fainelli <[email protected]> | 2017-10-06 15:17:19 -0700 |
|---|---|---|
| committer | Florian Fainelli <[email protected]> | 2017-10-06 15:17:19 -0700 |
| commit | 2e7a84aadd88aadd3bb6723db1572036757885d6 (patch) | |
| tree | 17d113ad31fa15630db6fe022fbddb3b51148732 | |
| parent | a7794db38ed826a2738f53b9b1e9c85cc0876fbe (diff) | |
| parent | f08f58a2bf68900a84e782b8c7ad701c0654173c (diff) | |
Merge tag 'bcm2835-dt-fixes-2017-10-06' into devicetree/next
This pull request brings in a fix for default serial console setup on
RPi3, so it now comes up with no config.txt/cmdline.txt settings in
the firmware.
Signed-off-by: Florian Fainelli <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 7 |
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 { |