Re: [PATCH v2] ARM: dts: bcm283x: Fix console path on RPi3

[Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 2566 bytes --]

Loic Poulain <loic.poulain-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:

> 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 ant uart1 paths.

s/ant/and/

> Remove unneeded earlyprintk.
>
> Fixes: 4188ea2aeb6d ("ARM: bcm283x: Define UART pinmuxing on board level")
> Signed-off-by: Loic Poulain <loic.poulain-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  v2: remove serial aliases redefinition in bcm2835-rpi-zero-w.dts
>
>  arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 --
>  arch/arm/boot/dts/bcm2837-rpi-3-b.dts    | 5 +++++
>  arch/arm/boot/dts/bcm283x.dtsi           | 7 ++++++-
>  3 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
> index 82651c3..35ace1b 100644
> --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
> +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
> @@ -22,8 +22,6 @@
>  	aliases {
>  		uart0 = "/soc/serial@7e201000";
>  		uart1 = "/soc/serial@7e215040";
> -		serial0 = "/soc/serial@7e201000";
> -		serial1 = "/soc/serial@7e215040";
>  	};

I think these lines you're removing are what would have got us serial
output on the mini-uart on this platform (which wants the same serial
setup as pi3).  Instead of removing these lines, shouldn't we either:

1) Replace this entire aliases block with the same chosen {} block as
   pi3

2) Replicate this block on pi3 as well, for consistency?

>  
>  	leds {
> diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
> index 20725ca..f1c0811 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 auxiliar UART instead of pl011 */

"auxiliary"

Thanks for your perseverence on this series.  I just want to make sure
we don't break the new pi0w stuff with this change, or I would have PRed
it to -fixes today.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]