arm64: dts: rockchip: Add ethernet0 aliases to the dts files for RK3566 and RK3588(S) boards

To complete the process started with the migration of the ethernet0 aliases from the SoC dtsi files to the board/device dts(i) files, started in [1], let's add ethernet0 aliases to the board dts files that had it missing. See also [2] for a related discussion.

At the same time, let's remove the ethernet0 alias from one SoM dtsi file, which doesn't enable the GMAC, and add the same alias back to the dependent board dts files, which actually enable the GMAC.

All these patches result in a rather clean situation when it comes to the Rockchip arm64 device-tree aliases.

[1] https://lore.kernel.org/linux-rockchip/[email protected]/T/#u
[2] https://lore.kernel.org/linux-rockchip/5119280.687JKscXgg@diego/T/#u

Dragan Simic (2):
arm64: dts: rockchip: Add ethernet0 alias to the dts for RK3566 boards
arm64: dts: rockchip: Add ethernet0 alias to the dts for RK3588(S)
boards

 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts     | 1 +
 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts   | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts     | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi        | 1 -
 arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts         | 1 +
 arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts      | 1 +
 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts      | 1 +
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts         | 1 +
 10 files changed, 18 insertions(+), 1 deletion(-)

Add ethernet0 alias to the board dts files for a few supported RK3566 boards that had it missing. Also, remove the ethernet0 alias from one RK3566 SoM dtsi file, which doesn't enable the GMAC, and add the ethernet0 alias back to the dependent board dts files, which actually enable the GMAC.

---
 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts     | 1 +
 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts   | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts     | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi        | 1 -
 6 files changed, 14 insertions(+), 1 deletion(-)

index 1b1c67d5b1ef..3ae24e39450a 100644
@@ -14,6 +14,7 @@ / {
 	compatible = "radxa,cm3-io", "radxa,cm3", "rockchip,rk3566";
 
 	aliases {
+		ethernet0 = &gmac1;
 		mmc1 = &sdmmc0;
 	};
 

index 938092fce186..63eea27293fe 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "firefly,rk3566-roc-pc", "rockchip,rk3566";
 
 	aliases {
+		ethernet0 = &gmac1;
 		mmc0 = &sdmmc0;
 		mmc1 = &sdhci;
 		mmc2 = &sdmmc1;

index 4e49bebf548b..fdbf1c783242 100644
@@ -13,6 +13,10 @@ / {
 	model = "PINE64 RK3566 SOQuartz on Blade carrier board";
 	compatible = "pine64,soquartz-blade", "pine64,soquartz", "rockchip,rk3566";
 
+	aliases {
+		ethernet0 = &gmac1;
+	};
+
 	/* labeled VCC3V0_SD in schematic to not conflict with PMIC regulator */
 	vcc3v0_sd: vcc3v0-sd-regulator {
 		compatible = "regulator-fixed";

index cddf6cd2fecb..6ed3fa4aee34 100644
@@ -8,6 +8,10 @@ / {
 	model = "Pine64 RK3566 SoQuartz with CM4-IO Carrier Board";
 	compatible = "pine64,soquartz-cm4io", "pine64,soquartz", "rockchip,rk3566";
 
+	aliases {
+		ethernet0 = &gmac1;
+	};
+
 	/* labeled +12v in schematic */
 	vcc12v_dcin: vcc12v-dcin-regulator {
 		compatible = "regulator-fixed";

index 2208dbfb7f0a..f2095dfa4eaf 100644
@@ -8,6 +8,10 @@ / {
 	model = "PINE64 RK3566 SOQuartz on Model A carrier board";
 	compatible = "pine64,soquartz-model-a", "pine64,soquartz", "rockchip,rk3566";
 
+	aliases {
+		ethernet0 = &gmac1;
+	};
+
 	/* labeled DCIN_12V in schematic */
 	vcc12v_dcin: vcc12v-dcin-regulator {
 		compatible = "regulator-fixed";

index 63bae36b8f7e..bfb7b952f4c5 100644
@@ -12,7 +12,6 @@ / {
 	compatible = "pine64,soquartz", "rockchip,rk3566";
 
 	aliases {
-		ethernet0 = &gmac1;
 		mmc0 = &sdmmc0;
 		mmc1 = &sdhci;
 		mmc2 = &sdmmc1;

Add ethernet0 alias to the board dts files for a few supported RK3588 and RK3588S boards that had it missing.

---
 arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts    | 1 +
 arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts    | 1 +
 4 files changed, 4 insertions(+)

index b9d789d57862..3cd748ee84c6 100644
@@ -16,6 +16,7 @@ / {
 	compatible = "rockchip,rk3588-evb1-v10", "rockchip,rk3588";
 
 	aliases {
+		ethernet0 = &gmac0;
 		mmc0 = &sdhci;
 		serial2 = &uart2;
 	};

index 5c59f9571dce..467622a8c008 100644
@@ -17,6 +17,7 @@ / {
 	compatible = "pine64,quartzpro64", "rockchip,rk3588";
 
 	aliases {
+		ethernet0 = &gmac0;
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
 		serial2 = &uart2;

index e3a839a12dc6..36269100d2ee 100644
@@ -13,6 +13,7 @@ / {
 	compatible = "xunlong,orangepi-5", "rockchip,rk3588s";
 
 	aliases {
+		ethernet0 = &gmac1;
 		mmc0 = &sdmmc;
 		serial2 = &uart2;
 	};

index 8347adcbd003..abd6934ab3b7 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "radxa,rock-5a", "rockchip,rk3588s";
 
 	aliases {
+		ethernet0 = &gmac1;
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
 		serial2 = &uart2;

Applied, thanks!

[1/2] arm64: dts: rockchip: Add ethernet0 alias to the dts for RK3566 boards

      commit: 8a5f97b061432f72002b8aa158e372f1b10a079e
[2/2] arm64: dts: rockchip: Add ethernet0 alias to the dts for RK3588(S) boards
      commit: a40d30460dda56c6ad308cb338e240bc4a625faa

Best regards,

Heiko Stuebner <[email protected]>

Great, thanks!