Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 07:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: Remove ethernet0 alias from the SoC dtsi for RK3399

Browse Source 
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 <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/20879826c01fb9ead71c339866846ea794669802.1702366958.git.dsimic@manjaro.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Dragan Simic 2023-12-12 08:53:48 +01:00 committed by Heiko Stuebner
parent c87847cfc1
commit 5d90cb1edc
19 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
View File

@ -15,6 +15,7 @@
compatible = "openailab,eaidk-610", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
mmc0 = &sdio0;
mmc1 = &sdmmc;
mmc2 = &sdhci;

1
arch/arm64/boot/dts/rockchip/rk3399-evb.dts
View File

@ -12,6 +12,7 @@
compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
mmc0 = &sdhci;
};

4
arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
View File

@ -16,6 +16,7 @@
compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
mmc0 = &sdio0;
mmc1 = &sdmmc;
mmc2 = &sdhci;

1
arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
View File

@ -11,6 +11,7 @@
compatible = "hugsun,x99", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
mmc0 = &sdio0;
mmc1 = &sdmmc;
mmc2 = &sdhci;

4
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts
View File

@ -10,6 +10,10 @@
/ {
model = "Khadas Edge-Captain";
compatible = "khadas,edge-captain", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
};
};
&gmac {

4
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
View File

@ -19,6 +19,7 @@
compatible = "kobol,helios64", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
mmc0 = &sdmmc;
mmc1 = &sdhci;
spi1 = &spi1;

1
arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
View File

@ -9,6 +9,7 @@
/ {
aliases {
ethernet0 = &gmac;
mmc0 = &sdhci;
};

1
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
View File

@ -12,6 +12,7 @@
/ {
aliases {
ethernet0 = &gmac;
mmc0 = &sdhci;
mmc1 = &sdmmc;
};

1
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
View File

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

1
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View File

@ -12,6 +12,7 @@
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
aliases {
ethernet0 = &gmac;
mmc0 = &sdmmc;
mmc1 = &sdhci;
};

1
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View File

@ -19,7 +19,6 @@
#size-cells = <2>;
aliases {
ethernet0 = &gmac;
gpio0 = &gpio0;
gpio1 = &gpio1;
gpio2 = &gpio2;

1
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
View File

@ -13,6 +13,7 @@
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
aliases {
ethernet0 = &gmac;
mmc0 = &sdhci;
mmc1 = &sdmmc;
};