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

A patch from »arm64: dts: rockchip: aliases for core busses in main dtsi« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko.stuebner@...> Date: Wed, 29 Nov 2023 20:09:47 +0100

Commit-Message

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. So instead of having 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@...>

Patch-Comment

.../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 4 ---- .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 4 ---- arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 1 - .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 2 -- .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 - .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 13 +++++++++++++ 13 files changed, 13 insertions(+), 19 deletions(-)

Statistics

  • 13 lines added
  • 19 lines removed

Changes

----------- arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts -----------
index b51543892078..be6a4f4f90f6 100644
@@ -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";
};
----------- arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts -----------
index 9933765e4097..96a18077f26f 100644
@@ -12,10 +12,6 @@ / {
compatible = "edgeble,neural-compute-module-6b-io",
"edgeble,neural-compute-module-6b", "rockchip,rk3588";
- aliases {
- serial2 = &uart2;
- };
-
chosen {
stdout-path = "serial2:1500000n8";
};
--------------- arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts ---------------
index b9d789d57862..a36d4fcd9b1d 100644
@@ -17,7 +17,6 @@ / {
aliases {
mmc0 = &sdhci;
- serial2 = &uart2;
};
chosen {
-------------- arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts ---------------
index 97af4f912828..612107615e66 100644
@@ -19,7 +19,6 @@ / {
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
- serial2 = &uart2;
};
chosen {
----------- arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts ------------
index 298c183d6f4f..3e660ff6cd5f 100644
@@ -19,7 +19,6 @@ / {
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
- serial2 = &uart2;
};
chosen {
------------- arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts --------------
index 5c59f9571dce..c7cd57609bc2 100644
@@ -19,7 +19,6 @@ / {
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
- serial2 = &uart2;
};
chosen {
--------------- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ----------------
index 741f631db345..e302eeb6ce5a 100644
@@ -14,7 +14,6 @@ aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
mmc2 = &sdio;
- serial2 = &uart2;
};
chosen {
------------- arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi --------------
index 9570b34aca2e..25a0ca73a8f7 100644
@@ -19,8 +19,6 @@ / {
aliases {
ethernet0 = &gmac1;
mmc0 = &sdhci;
- serial2 = &uart2;
- serial9 = &uart9;
};
fan: pwm-fan {
----------- arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts -----------
index 60f00ceb630e..dc677f29a9c7 100644
@@ -44,7 +44,6 @@ aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
mmc2 = &sdio;
- serial2 = &uart2;
};
chosen {
------------ arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -------------
index 82478a452533..f53e993c785e 100644
@@ -12,7 +12,6 @@ / {
aliases {
mmc0 = &sdhci;
- serial2 = &uart2;
};
chosen {
------------- arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts --------------
index 8f399c4317bd..52ec9cb38f57 100644
@@ -14,7 +14,6 @@ / {
aliases {
mmc0 = &sdmmc;
- serial2 = &uart2;
};
chosen {
--------------- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts ---------------
index 8347adcbd003..73cf97062a09 100644
@@ -14,7 +14,6 @@ / {
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;
- serial2 = &uart2;
};
analog-sound {
------------------ arch/arm64/boot/dts/rockchip/rk3588s.dtsi -------------------
index 8aa0499f9b03..d854536a44b8 100644
@@ -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>;
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...