iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: rockchip: move rk3588 serial aliases to soc dtsi

Browse Source 
The serial ports on rk3588 are named uart0 - uart9. Board schematics
also use these exact numbers and we want those names to also reflect
in the OS devices because everything else would just cause confusion.

To prevent each board repeating their list of serial aliases, move them
to the soc dtsi, as all previous Rockchip soc do already.

Signed-off-by: Heiko Stuebner <heiko.stuebner@cherry.de>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/20231205164842.556684-2-heiko@sntech.de
This commit is contained in:
Heiko Stuebner 2023-12-05 17:48:39 +01:00 committed by Heiko Stuebner
parent d1b8b36a2c
commit 9918d10d16
13 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts
View File

@ -12,10 +12,6 @@
compatible = "edgeble,neural-compute-module-6a-io",
"edgeble,neural-compute-module-6a", "rockchip,rk3588";
aliases {
serial2 = &uart2;
};
chosen {
stdout-path = "serial2:1500000n8";
};

4
arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts
View File

@ -12,10 +12,6 @@
compatible = "edgeble,neural-compute-module-6a-io",
"edgeble,neural-compute-module-6b", "rockchip,rk3588";
aliases {
serial2 = &uart2;
};
chosen {
stdout-path = "serial2:1500000n8";
};

1
arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
View File

@ -17,7 +17,6 @@
aliases {
mmc0 = &sdhci;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
View File

@ -19,7 +19,6 @@
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
View File

@ -19,7 +19,6 @@
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
View File

@ -19,7 +19,6 @@
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
View File

@ -14,7 +14,6 @@
mmc0 = &sdhci;
mmc1 = &sdmmc;
mmc2 = &sdio;
serial2 = &uart2;
};
chosen {

2
arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
View File

@ -19,8 +19,6 @@
aliases {
ethernet0 = &gmac1;
mmc0 = &sdhci;
serial2 = &uart2;
serial9 = &uart9;
};
fan: pwm-fan {

1
arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
View File

@ -44,7 +44,6 @@
mmc0 = &sdhci;
mmc1 = &sdmmc;
mmc2 = &sdio;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
View File

@ -12,7 +12,6 @@
aliases {
mmc0 = &sdhci;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
View File

@ -14,7 +14,6 @@
aliases {
mmc0 = &sdmmc;
serial2 = &uart2;
};
chosen {

1
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
View File

@ -14,7 +14,6 @@
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
serial2 = &uart2;
};
analog-sound {

13
arch/arm64/boot/dts/rockchip/rk3588s.dtsi
View File

@ -18,6 +18,19 @@
#address-cells = <2>;
#size-cells = <2>;
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
serial6 = &uart6;
serial7 = &uart7;
serial8 = &uart8;
serial9 = &uart9;
};
cpus {
#address-cells = <1>;
#size-cells = <0>;