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: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/riscv/boot/dts/canaan/canaan_kd233.dts b/arch/riscv/boot/dts/canaan/canaan_kd233.dts
index 8df4cf3656f2c93249f0576fe6b10529b5ccd335..8cbef8daaec1097b12ea92eee04d95dbd3fa260a 100644 (file)
--- a/arch/riscv/boot/dts/canaan/canaan_kd233.dts
+++ b/arch/riscv/boot/dts/canaan/canaan_kd233.dts
@@ -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";

diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/canaan/k210.dtsi
index f87c5164d9cf658d6dbc58af85764ed2c6cd4cf3..febdff79c13cc5fca52014c6f038e53a5a8d941d 100644 (file)
--- a/arch/riscv/boot/dts/canaan/k210.dtsi
+++ b/arch/riscv/boot/dts/canaan/k210.dtsi
@@ -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

diff --git a/arch/riscv/boot/dts/canaan/k210_generic.dts b/arch/riscv/boot/dts/canaan/k210_generic.dts
index 396c8ca4d24db79ae9748ff7f263fa1b514f0da5..36b4ba9cc556bc3f29764c268d813f1efc89869f 100644 (file)
--- a/arch/riscv/boot/dts/canaan/k210_generic.dts
+++ b/arch/riscv/boot/dts/canaan/k210_generic.dts
@@ -15,6 +15,10 @@
        model = "Kendryte K210 generic";
        compatible = "canaan,kendryte-k210";
 
+       aliases {
+               serial0 = &uarths0;
+       };
+
        chosen {
                bootargs = "earlycon console=ttySIF0";
                stdout-path = "serial0:115200n8";

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
index 6d25bf07481a6ed8ecbe74e10316825f630cc559..e5a77672fc65bc47333c8c0bf8c428edf83eeba1 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
@@ -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";

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
index f4f4d8d5e8b88cad89664f6c6d4e105f97e44c92..04c2bf227b1c69adb5985846f3adde76dd955ec9 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
@@ -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";

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
index 0d86df47e1ed3987afd424db059ec5a271bf0fdf..f9f6cc136bc3d98a97a548be6e29af79e0a93f53 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
@@ -16,6 +16,10 @@
        model = "SiPeed MAIX GO";
        compatible = "sipeed,maix-go", "canaan,kendryte-k210";
 
+       aliases {
+               serial0 = &uarths0;
+       };
+
        chosen {
                bootargs = "earlycon console=ttySIF0";
                stdout-path = "serial0:115200n8";

diff --git a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
index 5c05c498e2b88bf4f6310b4168e47ef810f33745..e90188bfb70bd8a42aefd2f70d8a2fdcf95d79c7 100644 (file)
--- a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
+++ b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
@@ -15,6 +15,10 @@
        model = "SiPeed MAIXDUINO";
        compatible = "sipeed,maixduino", "canaan,kendryte-k210";
 
+       aliases {
+               serial0 = &uarths0;
+       };
+
        chosen {
                bootargs = "earlycon console=ttySIF0";
                stdout-path = "serial0:115200n8";