Remove ethernetX aliases from the SoC dtsi for RK3399, RK3368, RK3328 and PX30

PATCH Applied Dragan Simic 2 participants 7 messages Dec 12, 2023

Subsystems (2)

Device tree bindings Arm Rockchip

lore

Share & tools

lore

Dragan Simic

author

2023-12-12 07:53 UTC #0 lore raw

cover Remove ethernetX aliases from the SoC dtsi for RK3399, RK3368, RK3328 and PX30

Unlike for the I2C buses, GPIO lines and UARTs, the Rockchip SoC TRMs and datasheets define no numbering for the built-in GMAC(s) or MAC(s), if there are more than one found in the particular Rockchip SoC.

Moreover, not all boards or devices based on these SoCs actually use the built-in GMAC(s) or MAC(s). Thus, let's remove the ethernetX aliases from the SoC dtsi files and add them back to the appropriate board and device dts(i) files. See also [1] for the initial discussion.

This is quite similar to the already performed migration of the mmcX aliases from the Rockchip SoC dtsi files to the board dts(i) files.

The correctness of the patches in this series was verified by comparing the contents of the compiled dtb files before and after applying the patches. All of the affected dtb files checked out fine.

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

Dragan Simic (4):
arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for

    RK3399
  arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for
    RK3368
  arm64: dts: rockchip: Remove ethernetX aliases from the SoC dtsi for
    RK3328
  arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for
    PX30

 arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi       | 1 +
 arch/arm64/boot/dts/rockchip/px30-evb.dts                   | 1 +
 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts       | 1 +
 arch/arm64/boot/dts/rockchip/px30.dtsi                      | 1 -
 arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts             | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-a1.dts                  | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts                 | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts          | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts    | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts              | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts           | 2 ++
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts              | 1 +
 arch/arm64/boot/dts/rockchip/rk3328.dtsi                    | 2 --
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi                | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts             | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi               | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts      | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts                 | 1 +
 arch/arm64/boot/dts/rockchip/rk3368.dtsi                    | 1 -
 arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts                 | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-ficus.dts               | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts             | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts          | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts       | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts      | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi            | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts            | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi               | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi             | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts        | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi          | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi          | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi           | 1 +
 arch/arm64/boot/dts/rockchip/rk3399.dtsi                    | 1 -
 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi       | 1 +
 38 files changed, 44 insertions(+), 5 deletions(-)

Dragan Simic

author

2023-12-12 07:53 UTC #1 lore raw

PATCH 1/4 arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3399

Not all supported boards actually use the RK3399's built-in GMAC, while the SoC TRM and the datasheet don't define some standard numbering in this case. Thus, remove the ethernet0 alias from the RK3399 SoC dtsi file, and add the same alias back to the appropriate board dts(i) files.

This is quite similar to the already performed migration of the mmcX aliases from the Rockchip SoC dtsi files to the board dts(i) files.

Signed-off-by Dragan Simic <[email protected]>

---
 arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts                 | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-ficus.dts               | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts             | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts          | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts       | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts      | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi            | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts            | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi               | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi             | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts        | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi          | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi          | 1 +
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi           | 1 +
 arch/arm64/boot/dts/rockchip/rk3399.dtsi                    | 1 -
 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi       | 1 +
 19 files changed, 27 insertions(+), 1 deletion(-)

arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts +1 -0

index 6464ef4d113d..173da81fc231 100644
@@ -15,6 +15,7 @@ / {
 	compatible = "openailab,eaidk-610", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-evb.dts +1 -0

index 3d1e126b553f..55eca7a50a1f 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdhci;
 	};

arch/arm64/boot/dts/rockchip/rk3399-ficus.dts +4 -0

index 1ce85a5816e4..30e4879f322c 100644
@@ -13,6 +13,10 @@ / {
 	model = "96boards RK3399 Ficus";
 	compatible = "vamrs,ficus", "rockchip,rk3399";
 
+	aliases {
+		ethernet0 = &gmac;
+	};
+
 	chosen {
 		stdout-path = "serial2:1500000n8";
 	};

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +1 -0

index c5db64f3e124..260415d99aeb 100644
@@ -16,6 +16,7 @@ / {
 	compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts +1 -0

index 7af27e8216f1..4a6ab6c2e24c 100644
@@ -11,6 +11,7 @@ / {
 	compatible = "hugsun,x99", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts +4 -0

index 8302e51def52..99ac4ed0f13f 100644
@@ -10,6 +10,10 @@
 / {
 	model = "Khadas Edge-Captain";
 	compatible = "khadas,edge-captain", "rockchip,rk3399";
+
+	aliases {
+		ethernet0 = &gmac;
+	};
 };
 
 &gmac {

arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts +4 -0

index f5dcb99dc349..e12e7b4d64ca 100644
@@ -10,6 +10,10 @@
 / {
 	model = "Khadas Edge-V";
 	compatible = "khadas,edge-v", "rockchip,rk3399";
+
+	aliases {
+		ethernet0 = &gmac;
+	};
 };
 
 &gmac {

arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +1 -0

index 1eb287a3f8c0..9e3aec4440bd 100644
@@ -19,6 +19,7 @@ / {
 	compatible = "kobol,helios64", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdmmc;
 		mmc1 = &sdhci;
 		spi1 = &spi1;

arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts +1 -0

index a21ac319f809..cb69e2145fa9 100644
@@ -15,6 +15,7 @@ / {
 	compatible = "leez,p710", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +1 -0

index 7c5f441a2219..b7f1e47978a6 100644
@@ -18,6 +18,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +1 -0

index dba4d03bfc2b..e7551449e718 100644
@@ -17,6 +17,7 @@ / {
 	compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +1 -0

index 20e3f41efe97..574a775ca880 100644
@@ -9,6 +9,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdhci;
 	};

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -0

index c32913df93c3..ca7a446b6568 100644
@@ -14,6 +14,7 @@ / {
 	compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdmmc;
 		mmc1 = &sdhci;
 	};

arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +1 -0

index 8bfd5f88d1ef..7baf9d1b22fd 100644
@@ -15,6 +15,7 @@ / {
 	compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
 	};

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +1 -0

index f2279aa6ca9e..281a12180703 100644
@@ -12,6 +12,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
 	};

arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +1 -0

index bca2b50e0a93..f30b82a10ca3 100644
@@ -11,6 +11,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &sdmmc;
 		mmc2 = &sdhci;

arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +1 -0

index e6ac292ce645..26c41f1e9adb 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdmmc;
 		mmc1 = &sdhci;
 	};

arch/arm64/boot/dts/rockchip/rk3399.dtsi +0 -1

index da0dfb237f85..cf653246d5b7 100644
@@ -19,7 +19,6 @@ / {
 	#size-cells = <2>;
 
 	aliases {
-		ethernet0 = &gmac;
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;

arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +1 -0

index 8b8992a8e9c0..8823c924dc1d 100644
@@ -13,6 +13,7 @@ / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
 	};

Dragan Simic

author

2023-12-12 07:53 UTC #2 lore raw

PATCH 2/4 arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3368

In reply to Dragan Simic

Not all supported boards actually use the RK3368's built-in GMAC, while the SoC TRM and the datasheet don't define some standard numbering in this case. Thus, remove the ethernet0 alias from the RK3368 SoC dtsi file, and add the same alias back to the appropriate board dts(i) files.

This is quite similar to the already performed migration of the mmcX aliases from the Rockchip SoC dtsi files to the board dts(i) files.

Signed-off-by Dragan Simic <[email protected]>

---
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi           | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts        | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi          | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts            | 1 +
 arch/arm64/boot/dts/rockchip/rk3368.dtsi               | 1 -
 6 files changed, 5 insertions(+), 1 deletion(-)

arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +1 -0

index e47d1398aeca..b48b98c13705 100644
@@ -9,6 +9,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts +1 -0

index be06e6e64d18..029b8e22e709 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "geekbuying,geekbox", "rockchip,rk3368";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi +1 -0

index 5753e57fd716..8ac8acf4082d 100644
@@ -8,6 +8,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +1 -0

index 81d1064fdb21..dcee2e28916f 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdmmc;
 		mmc1 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3368-r88.dts +1 -0

index 5589f3db6b36..b16b7ca02379 100644
@@ -12,6 +12,7 @@ / {
 	compatible = "rockchip,r88", "rockchip,rk3368";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdio0;
 		mmc1 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3368.dtsi +0 -1

index a4c5aaf1f457..7b8c416aa890 100644
@@ -19,7 +19,6 @@ / {
 	#size-cells = <2>;
 
 	aliases {
-		ethernet0 = &gmac;
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;

Dragan Simic

author

2023-12-12 07:53 UTC #3 lore raw

PATCH 3/4 arm64: dts: rockchip: Remove ethernetX aliases from the SoC dtsi for RK3328

In reply to Dragan Simic

Not all supported boards actually use the RK3328's built-in GMACs, while the SoC TRM and the datasheet don't define some standard numbering in this case. Thus, remove the ethernet0 and ethernet1 aliases from the RK3328 SoC dtsi file, and add the same alias back to the appropriate board dts(i) files.

These changes also touch one RK3318-based board dts, because it actually depends on the RK3328 SoC dtsi and enables one of the GMACs.

This is quite similar to the already performed migration of the mmcX aliases from the Rockchip SoC dtsi files to the board dts(i) files.

Signed-off-by Dragan Simic <[email protected]>

---
 arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts          | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-a1.dts               | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts              | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts       | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts        | 2 ++
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts           | 1 +
 arch/arm64/boot/dts/rockchip/rk3328.dtsi                 | 2 --
 9 files changed, 9 insertions(+), 2 deletions(-)

arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts +1 -0

index 1deef53a4c94..c7b1862fca6a 100644
@@ -9,6 +9,7 @@ / {
 	compatible = "zkmagic,a95x-z2", "rockchip,rk3318";
 
 	aliases {
+		ethernet0 = &gmac2phy;
 		mmc0 = &sdmmc;
 		mmc1 = &sdio;
 		mmc2 = &emmc;

arch/arm64/boot/dts/rockchip/rk3328-a1.dts +1 -0

index 40bf808642b9..824183e515da 100644
@@ -9,6 +9,7 @@ / {
 	compatible = "azw,beelink-a1", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2io;
 		mmc0 = &sdmmc;
 		mmc1 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3328-evb.dts +1 -0

index ff6b466e0e07..1eef5504445f 100644
@@ -11,6 +11,7 @@ / {
 	compatible = "rockchip,rk3328-evb", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2phy;
 		mmc0 = &sdmmc;
 		mmc1 = &sdio;
 		mmc2 = &emmc;

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +1 -0

index 1445b879ac7a..a4399da7d8b1 100644
@@ -14,6 +14,7 @@ / {
 	compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2io;
 		ethernet1 = &rtl8153;
 		mmc0 = &sdmmc;
 	};

arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +1 -0

index dc83d74045a3..f20662929c77 100644
@@ -15,6 +15,7 @@ / {
 	compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2io;
 		ethernet1 = &rtl8153;
 		mmc0 = &sdmmc;
 	};

arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +1 -0

index 5d5d9574088c..414897a57e75 100644
@@ -11,6 +11,7 @@ / {
 	compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2io;
 		mmc0 = &sdmmc;
 		mmc1 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +2 -0

index 018a3a5075c7..07f00af19aaf 100644
@@ -21,6 +21,8 @@ / {
 	compatible = "radxa,rockpi-e", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2io;
+		ethernet1 = &gmac2phy;
 		mmc0 = &sdmmc;
 		mmc1 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +1 -0

index 0a27fa5271f5..229fe9da9c2d 100644
@@ -11,6 +11,7 @@ / {
 	compatible = "pine64,rock64", "rockchip,rk3328";
 
 	aliases {
+		ethernet0 = &gmac2io;
 		mmc0 = &sdmmc;
 		mmc1 = &emmc;
 	};

arch/arm64/boot/dts/rockchip/rk3328.dtsi +0 -2

index cc8209795c3e..41433d3340ce 100644
@@ -27,8 +27,6 @@ aliases {
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		i2c3 = &i2c3;
-		ethernet0 = &gmac2io;
-		ethernet1 = &gmac2phy;
 	};
 
 	cpus {

Dragan Simic

author

2023-12-12 07:53 UTC #4 lore raw

PATCH 4/4 arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for PX30

In reply to Dragan Simic

Not all supported boards actually use the PX30's built-in (G)MAC, while the SoC TRM and the datasheet don't define some standard numbering in this case. Thus, remove the ethernet0 alias from the PX30 SoC dtsi file, and add the same alias back to the appropriate board dts(i) files.

This is quite similar to the already performed migration of the mmcX aliases from the Rockchip SoC dtsi files to the board dts(i) files.

Signed-off-by Dragan Simic <[email protected]>

---
 arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi | 1 +
 arch/arm64/boot/dts/rockchip/px30-evb.dts             | 1 +
 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts | 1 +
 arch/arm64/boot/dts/rockchip/px30.dtsi                | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi +1 -0

index 3429e124d95a..5b4e22385165 100644
@@ -7,6 +7,7 @@
 
 / {
 	aliases {
+		ethernet0 = &gmac;
 		mmc1 = &sdmmc;
 		mmc2 = &sdio;
 	};

arch/arm64/boot/dts/rockchip/px30-evb.dts +1 -0

index c1bbd555f5f5..0a90a88fc664 100644
@@ -14,6 +14,7 @@ / {
 	compatible = "rockchip,px30-evb", "rockchip,px30";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc0 = &sdmmc;
 		mmc1 = &sdio;
 		mmc2 = &emmc;

arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts +1 -0

index 7d4c5324c61b..16798eb77077 100644
@@ -13,6 +13,7 @@ / {
 	compatible = "tsd,px30-ringneck-haikou", "rockchip,px30";
 
 	aliases {
+		ethernet0 = &gmac;
 		mmc2 = &sdmmc;
 	};

arch/arm64/boot/dts/rockchip/px30.dtsi +0 -1

index 42ce78beb413..d0905515399b 100644
@@ -20,7 +20,6 @@ / {
 	#size-cells = <2>;
 
 	aliases {
-		ethernet0 = &gmac;
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;

Heiko Stuebner

maintainer Applied

2023-12-12 20:16 UTC #5 lore raw

In reply to Dragan Simic

Quoted 10 lines · Dragan Simic

Unlike for the I2C buses, GPIO lines and UARTs, the Rockchip SoC TRMs and datasheets define no numbering for the built-in GMAC(s) or MAC(s), if there are more than one found in the particular Rockchip SoC.
Moreover, not all boards or devices based on these SoCs actually use the built-in GMAC(s) or MAC(s). Thus, let's remove the ethernetX aliases from the SoC dtsi files and add them back to the appropriate board and device dts(i) files. See also [1] for the initial discussion.
[...]

Applied, thanks!

[1/4] arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3399

      commit: 8030063ca9b019f9dfb90a654f557d8bb15a97a5
[2/4] arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3368
      commit: 7aab60df473c70f74880267500884b12151b160b
[3/4] arm64: dts: rockchip: Remove ethernetX aliases from the SoC dtsi for RK3328
      commit: 20a9a7667af6b11b7369073d0186d9c92e52db04
[4/4] arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for PX30
      commit: a69907a915e4c15bf7e632cd324ec5c3e38c3afc

Best regards,

Signature · 1 line

Heiko Stuebner <[email protected]>

Dragan Simic

author

2023-12-12 21:52 UTC #6 lore raw

Quoted 15 lines · Heiko Stuebner

Quoted 10 lines · Dragan Simic
Unlike for the I2C buses, GPIO lines and UARTs, the Rockchip SoC TRMs and datasheets define no numbering for the built-in GMAC(s) or MAC(s), if there are more than one found in the particular Rockchip SoC.
Moreover, not all boards or devices based on these SoCs actually use the built-in GMAC(s) or MAC(s). Thus, let's remove the ethernetX aliases from the SoC dtsi files and add them back to the appropriate board and device dts(i) files. See also [1] for the initial discussion.
[...]
Applied, thanks!
[1/4] arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3399

Quoted 8 lines

      commit: 8030063ca9b019f9dfb90a654f557d8bb15a97a5
[2/4] arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3368
      commit: 7aab60df473c70f74880267500884b12151b160b
[3/4] arm64: dts: rockchip: Remove ethernetX aliases from the SoC dtsi
for RK3328
      commit: 20a9a7667af6b11b7369073d0186d9c92e52db04
[4/4] arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for PX30
      commit: a69907a915e4c15bf7e632cd324ec5c3e38c3afc

Great, thanks!