Skip to content

Commit 9235784

Browse files
geertuConchuOD
authored andcommitted
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>
1 parent 1613e60 commit 9235784

7 files changed

Lines changed: 24 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
model = "Kendryte KD233";
1616
compatible = "canaan,kendryte-kd233", "canaan,kendryte-k210";
1717

18+
aliases {
19+
serial0 = &uarths0;
20+
};
21+
1822
chosen {
1923
bootargs = "earlycon console=ttySIF0";
2024
stdout-path = "serial0:115200n8";

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
#size-cells = <1>;
1717
compatible = "canaan,kendryte-k210";
1818

19-
aliases {
20-
serial0 = &uarths0;
21-
serial1 = &uart1;
22-
serial2 = &uart2;
23-
serial3 = &uart3;
24-
};
25-
2619
/*
2720
* The K210 has an sv39 MMU following the privileged specification v1.9.
2821
* Since this is a non-ratified draft specification, the kernel does not

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
model = "Kendryte K210 generic";
1616
compatible = "canaan,kendryte-k210";
1717

18+
aliases {
19+
serial0 = &uarths0;
20+
};
21+
1822
chosen {
1923
bootargs = "earlycon console=ttySIF0";
2024
stdout-path = "serial0:115200n8";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
compatible = "sipeed,maix-bit", "sipeed,maix-bitm",
1818
"canaan,kendryte-k210";
1919

20+
aliases {
21+
serial0 = &uarths0;
22+
};
23+
2024
chosen {
2125
bootargs = "earlycon console=ttySIF0";
2226
stdout-path = "serial0:115200n8";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
compatible = "sipeed,maix-dock-m1", "sipeed,maix-dock-m1w",
1818
"canaan,kendryte-k210";
1919

20+
aliases {
21+
serial0 = &uarths0;
22+
};
23+
2024
chosen {
2125
bootargs = "earlycon console=ttySIF0";
2226
stdout-path = "serial0:115200n8";

arch/riscv/boot/dts/canaan/sipeed_maix_go.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
model = "SiPeed MAIX GO";
1717
compatible = "sipeed,maix-go", "canaan,kendryte-k210";
1818

19+
aliases {
20+
serial0 = &uarths0;
21+
};
22+
1923
chosen {
2024
bootargs = "earlycon console=ttySIF0";
2125
stdout-path = "serial0:115200n8";

arch/riscv/boot/dts/canaan/sipeed_maixduino.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
model = "SiPeed MAIXDUINO";
1616
compatible = "sipeed,maixduino", "canaan,kendryte-k210";
1717

18+
aliases {
19+
serial0 = &uarths0;
20+
};
21+
1822
chosen {
1923
bootargs = "earlycon console=ttySIF0";
2024
stdout-path = "serial0:115200n8";

0 commit comments

Comments
 (0)