diff mbox series

[v2] riscv: dts: microchip: mpfs-icicle: Fix serial console

Message ID 01b0aaeb50a960e36077669449a854e5d4c18a83.1629983839.git.geert@linux-m68k.org (mailing list archive)
State New, archived
Headers show
Series [v2] riscv: dts: microchip: mpfs-icicle: Fix serial console | expand

Commit Message

Geert Uytterhoeven Aug. 26, 2021, 1:19 p.m. UTC
Currently, nothing is output on the serial console, unless
"console=ttyS0,115200n8" or "earlycon" are appended to the kernel
command line.  Enable automatic console selection using
chosen/stdout-path by adding a proper alias, and configure the expected
serial rate.

While at it, add aliases for the other three serial ports, which are
provided on the same micro-USB connector as the first one.

Fixes: 0fa6107eca4186ad ("RISC-V: Initial DTS for Microchip ICICLE board")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
v2:
  - Add Reviewed-by,
  - Rebase on top of 417166ddec020c4e ("riscv: dts: microchip: Add
    ethernet0 to the aliases node"), as requested by Bin.
---
 arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Conor Dooley Aug. 31, 2021, 11:26 a.m. UTC | #1
On 26/08/2021 14:19, Geert Uytterhoeven wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Currently, nothing is output on the serial console, unless
> "console=ttyS0,115200n8" or "earlycon" are appended to the kernel
> command line.  Enable automatic console selection using
> chosen/stdout-path by adding a proper alias, and configure the expected
> serial rate.
>
> While at it, add aliases for the other three serial ports, which are
> provided on the same micro-USB connector as the first one.
>
> Fixes: 0fa6107eca4186ad ("RISC-V: Initial DTS for Microchip ICICLE board")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> v2:
>    - Add Reviewed-by,
>    - Rebase on top of 417166ddec020c4e ("riscv: dts: microchip: Add
>      ethernet0 to the aliases node"), as requested by Bin.
> ---
>   arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> index baea7d204639a185..b254c60589a1cc8b 100644
> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> @@ -16,10 +16,14 @@ / {
>
>          aliases {
>                  ethernet0 = &emac1;
> +               serial0 = &serial0;
> +               serial1 = &serial1;
> +               serial2 = &serial2;
> +               serial3 = &serial3;
>          };
>
>          chosen {
> -               stdout-path = &serial0;
> +               stdout-path = "serial0:115200n8";
>          };
>
>          cpus {
> --
> 2.25.1

Looks good, we've switched to using this ourselves.
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt Sept. 11, 2021, 6:58 a.m. UTC | #2
On Thu, 26 Aug 2021 06:19:39 PDT (-0700), geert@linux-m68k.org wrote:
> Currently, nothing is output on the serial console, unless
> "console=ttyS0,115200n8" or "earlycon" are appended to the kernel
> command line.  Enable automatic console selection using
> chosen/stdout-path by adding a proper alias, and configure the expected
> serial rate.
>
> While at it, add aliases for the other three serial ports, which are
> provided on the same micro-USB connector as the first one.
>
> Fixes: 0fa6107eca4186ad ("RISC-V: Initial DTS for Microchip ICICLE board")
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> v2:
>   - Add Reviewed-by,
>   - Rebase on top of 417166ddec020c4e ("riscv: dts: microchip: Add
>     ethernet0 to the aliases node"), as requested by Bin.
> ---
>  arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> index baea7d204639a185..b254c60589a1cc8b 100644
> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> @@ -16,10 +16,14 @@ / {
>
>  	aliases {
>  		ethernet0 = &emac1;
> +		serial0 = &serial0;
> +		serial1 = &serial1;
> +		serial2 = &serial2;
> +		serial3 = &serial3;
>  	};
>
>  	chosen {
> -		stdout-path = &serial0;
> +		stdout-path = "serial0:115200n8";
>  	};
>
>  	cpus {

Thanks, this is on for-next (there's no fixes right now, it's still 5.15 
for me).
diff mbox series

Patch

diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
index baea7d204639a185..b254c60589a1cc8b 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
@@ -16,10 +16,14 @@  / {
 
 	aliases {
 		ethernet0 = &emac1;
+		serial0 = &serial0;
+		serial1 = &serial1;
+		serial2 = &serial2;
+		serial3 = &serial3;
 	};
 
 	chosen {
-		stdout-path = &serial0;
+		stdout-path = "serial0:115200n8";
 	};
 
 	cpus {