Commit 9235784c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Conor Dooley
Browse files

riscv: dts: canaan: Clean up serial aliases 



The SoC-specific k210.dtsi declares aliases for all four serial ports.
However, none of the board-specific DTS files configure pin control for
any but the first serial port, so the last three ports are not usable.

Move the aliases node from the SoC-specific k210.dtsi to the
board-specific DTS files, as these are really board-specific, and retain
the sole port that is usable.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent 1613e604

arch/riscv/boot/dts/canaan/canaan_kd233.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ / { 
	model = "Kendryte KD233";

	compatible = "canaan,kendryte-kd233", "canaan,kendryte-k210";



	aliases {

		serial0 = &uarths0;

	};



	chosen {

		bootargs = "earlycon console=ttySIF0";

		stdout-path = "serial0:115200n8";

arch/riscv/boot/dts/canaan/k210.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ / { 
	#size-cells = <1>;

	compatible = "canaan,kendryte-k210";



	aliases {

		serial0 = &uarths0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

	};



	/*

	 * The K210 has an sv39 MMU following the privileged specification v1.9.

	 * Since this is a non-ratified draft specification, the kernel does not

arch/riscv/boot/dts/canaan/k210_generic.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ / { 
	model = "Kendryte K210 generic";

	compatible = "canaan,kendryte-k210";



	aliases {

		serial0 = &uarths0;

	};



	chosen {

		bootargs = "earlycon console=ttySIF0";

		stdout-path = "serial0:115200n8";

arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ / { 
	compatible = "sipeed,maix-bit", "sipeed,maix-bitm",

		     "canaan,kendryte-k210";



	aliases {

		serial0 = &uarths0;

	};



	chosen {

		bootargs = "earlycon console=ttySIF0";

		stdout-path = "serial0:115200n8";

arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ / { 
	compatible = "sipeed,maix-dock-m1", "sipeed,maix-dock-m1w",

		     "canaan,kendryte-k210";



	aliases {

		serial0 = &uarths0;

	};



	chosen {

		bootargs = "earlycon console=ttySIF0";

		stdout-path = "serial0:115200n8";