| Message ID | cover.1702366958.git.dsimic@manjaro.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | Remove ethernetX aliases from the SoC dtsi for RK3399, RK3368, RK3328 and PX30 | expand |
On Tue, 12 Dec 2023 08:53:47 +0100, Dragan Simic wrote: > 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,
On 2023-12-12 21:16, Heiko Stuebner wrote: > On Tue, 12 Dec 2023 08:53:47 +0100, Dragan Simic wrote: >> 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 Great, thanks!
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(-)