f08f58a2bf
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: 4188ea2aeb ("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>
57 lines
1023 B
Plaintext
57 lines
1023 B
Plaintext
/dts-v1/;
|
|
#include "bcm2837.dtsi"
|
|
#include "bcm2835-rpi.dtsi"
|
|
#include "bcm283x-rpi-smsc9514.dtsi"
|
|
#include "bcm283x-rpi-usb-host.dtsi"
|
|
|
|
/ {
|
|
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>;
|
|
};
|
|
|
|
leds {
|
|
act {
|
|
gpios = <&gpio 47 0>;
|
|
};
|
|
};
|
|
};
|
|
|
|
/* uart0 communicates with the BT module */
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
|
|
status = "okay";
|
|
};
|
|
|
|
/* uart1 is mapped to the pin header */
|
|
&uart1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart1_gpio14>;
|
|
status = "okay";
|
|
};
|
|
|
|
/* SDHCI is used to control the SDIO for wireless */
|
|
&sdhci {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&emmc_gpio34>;
|
|
status = "okay";
|
|
bus-width = <4>;
|
|
non-removable;
|
|
};
|
|
|
|
/* SDHOST is used to drive the SD card */
|
|
&sdhost {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&sdhost_gpio48>;
|
|
status = "okay";
|
|
bus-width = <4>;
|
|
};
|