diff options
| author | Loic Poulain <loic.poulain@gmail.com> | 2017-10-06 15:52:52 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-10-06 22:04:56 +0200 |
| commit | f08f58a2bf68900a84e782b8c7ad701c0654173c (patch) | |
| tree | 77c3fa3060e8055260f1128570de2d3c525db6eb /arch/arm/boot/dts/bcm2837-rpi-3-b.dts | |
| parent | Linux 4.14-rc1 (diff) | |
| download | linux-f08f58a2bf68900a84e782b8c7ad701c0654173c.tar.xz linux-f08f58a2bf68900a84e782b8c7ad701c0654173c.zip | |
ARM: dts: bcm283x: Fix console path on RPi3
Contrary to other RPi devices, RPi3 uses uart0 to communicate with
the BCM43438 bluetooth controller. uart1 is then used for the console.
Today, the console configuration is inherited from the bcm283x dtsi
(bootargs) which is not the correct one for the RPi3. This leads to
routing issue and confuses the Bluetooth controller with unexpected
data.
This patch introduces chosen/stdout path to configure console to uart0
on bcm283x family and overwrite it to uart1 in the RPi3 dts.
Create serial0/1 aliases referring to uart0 and uart1 paths.
Remove unneeded earlyprintk.
Fixes: 4188ea2aeb6d ("ARM: bcm283x: Define UART pinmuxing on board level")
Signed-off-by: Loic Poulain <loic.poulain@gmail.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'arch/arm/boot/dts/bcm2837-rpi-3-b.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 |
1 files changed, 5 insertions, 0 deletions
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>; }; |