c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
140 lines
4.0 KiB
Diff
140 lines
4.0 KiB
Diff
From 9918d10d16665527e59fdb87c5acac70cc1cfe8f Mon Sep 17 00:00:00 2001
|
|
From: Heiko Stuebner <heiko.stuebner@cherry.de>
|
|
Date: Tue, 5 Dec 2023 17:48:39 +0100
|
|
Subject: [PATCH] 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
|
|
---
|
|
.../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(-)
|
|
|
|
--- 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";
|
|
};
|
|
--- 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-6b-io",
|
|
"edgeble,neural-compute-module-6b", "rockchip,rk3588";
|
|
|
|
- aliases {
|
|
- serial2 = &uart2;
|
|
- };
|
|
-
|
|
chosen {
|
|
stdout-path = "serial2:1500000n8";
|
|
};
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
|
|
@@ -16,7 +16,6 @@
|
|
|
|
aliases {
|
|
mmc0 = &sdhci;
|
|
- serial2 = &uart2;
|
|
};
|
|
|
|
chosen {
|
|
--- 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 {
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
|
@@ -12,7 +12,6 @@
|
|
aliases {
|
|
mmc0 = &sdhci;
|
|
mmc1 = &sdmmc;
|
|
- serial2 = &uart2;
|
|
};
|
|
|
|
chosen {
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
|
|
@@ -15,7 +15,6 @@
|
|
mmc0 = &sdhci;
|
|
mmc1 = &sdmmc;
|
|
mmc2 = &sdio;
|
|
- serial2 = &uart2;
|
|
};
|
|
|
|
chosen {
|
|
--- 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 {
|
|
--- 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 {
|
|
--- 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>;
|