Commit 9012ab6b authored by Dragan Simic's avatar Dragan Simic Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: Remove ethernetX aliases from the SoC dtsi for RK3328 



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: default avatarDragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/0c14f2e354d32f5d45c718ce16643553ca72f6a5.1702366958.git.dsimic@manjaro.org


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent c900fef5

arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ / { 
	compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328";



	aliases {

		ethernet0 = &gmac2io;

		ethernet1 = &rtl8153;

		mmc0 = &sdmmc;

	};