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

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts
index b5154389207873c90be593ecdd60c9765b3ea070..be6a4f4f90f68bb98decaf12070e5f8a9670b500 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts
@@ -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";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts
index 861067b5d70757fb042bd37b2cab98408e0ca435..070baeb63431f960345f5622e1a1ee3a3df1b1ca 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts
@@ -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";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index 3369065f897d4c27e304ae25ae13a3dd441ce7ea..bc11e2fdc54f609179dfac11f5ef4811b38b2fa9 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -17,7 +17,6 @@
 
        aliases {
                mmc0 = &sdhci;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
index 97af4f912828543c0b5fb12fd3cf7ad75399b92c..612107615e66d50cc8ec66f19e4ba73776beb55b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -19,7 +19,6 @@
        aliases {
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
index 298c183d6f4fc9b5e8110a956551156f350b6325..3e660ff6cd5ff3d966356667e5b7db80a298da3b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
@@ -19,7 +19,6 @@
        aliases {
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
index 5c59f9571dce6ebb9cfd5c52a411b7fc4de4da4c..c7cd57609bc2e42d742ff0ef32eb2ff2d9aaf83d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
@@ -19,7 +19,6 @@
        aliases {
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 61b937beca7fc4eec1be083ef3be8749847b6ee8..74719aaf697c98f903676e1f4e95bdc10b336351 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -14,7 +14,6 @@
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
                mmc2 = &sdio;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
index 9570b34aca2e9308b63fb49bd44af8415454b515..25a0ca73a8f73a296da7b32f293ad771cb042100 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
@@ -19,8 +19,6 @@
        aliases {
                ethernet0 = &gmac1;
                mmc0 = &sdhci;
-               serial2 = &uart2;
-               serial9 = &uart9;
        };
 
        fan: pwm-fan {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
index 60f00ceb630e14e5734c71c7e974712982265f2f..dc677f29a9c7fca2359cf0d28b3ec3c9e97dda30 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
@@ -44,7 +44,6 @@
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
                mmc2 = &sdio;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
index 82478a45253371e38b74b733c0594842a9416da0..f53e993c785edbf25a31e0d30bf945ebe78d6934 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -12,7 +12,6 @@
 
        aliases {
                mmc0 = &sdhci;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index f7a6132d820515892fc9f1d81d20fd8f683a30d8..139131838cb657f430562bf9a6a6bad0a9af979a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -14,7 +14,6 @@
 
        aliases {
                mmc0 = &sdmmc;
-               serial2 = &uart2;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index 6fb03294576c471d1946e12e318997915798bf20..a1a29bce794b2a42ad2a88609e164741b1d32893 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -14,7 +14,6 @@
        aliases {
                mmc0 = &sdhci;
                mmc1 = &sdmmc;
-               serial2 = &uart2;
        };
 
        analog-sound {

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 7064c0e9179f1d868c5ebf28645f1f83a205098e..3947ca6836df355445bac7eceb7b7b43611b46ae 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -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>;