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 <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:
committed by
Heiko Stuebner
parent
c87847cfc1
commit
5d90cb1edc
@@ -15,6 +15,7 @@
|
|||||||
compatible = "openailab,eaidk-610", "rockchip,rk3399";
|
compatible = "openailab,eaidk-610", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
|
compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdhci;
|
mmc0 = &sdhci;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,10 @@
|
|||||||
model = "96boards RK3399 Ficus";
|
model = "96boards RK3399 Ficus";
|
||||||
compatible = "vamrs,ficus", "rockchip,rk3399";
|
compatible = "vamrs,ficus", "rockchip,rk3399";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
stdout-path = "serial2:1500000n8";
|
stdout-path = "serial2:1500000n8";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
|
compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
compatible = "hugsun,x99", "rockchip,rk3399";
|
compatible = "hugsun,x99", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -10,6 +10,10 @@
|
|||||||
/ {
|
/ {
|
||||||
model = "Khadas Edge-Captain";
|
model = "Khadas Edge-Captain";
|
||||||
compatible = "khadas,edge-captain", "rockchip,rk3399";
|
compatible = "khadas,edge-captain", "rockchip,rk3399";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&gmac {
|
&gmac {
|
||||||
|
|||||||
@@ -10,6 +10,10 @@
|
|||||||
/ {
|
/ {
|
||||||
model = "Khadas Edge-V";
|
model = "Khadas Edge-V";
|
||||||
compatible = "khadas,edge-v", "rockchip,rk3399";
|
compatible = "khadas,edge-v", "rockchip,rk3399";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&gmac {
|
&gmac {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
compatible = "kobol,helios64", "rockchip,rk3399";
|
compatible = "kobol,helios64", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdmmc;
|
mmc0 = &sdmmc;
|
||||||
mmc1 = &sdhci;
|
mmc1 = &sdhci;
|
||||||
spi1 = &spi1;
|
spi1 = &spi1;
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
compatible = "leez,p710", "rockchip,rk3399";
|
compatible = "leez,p710", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399";
|
compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdhci;
|
mmc0 = &sdhci;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
|
compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdmmc;
|
mmc0 = &sdmmc;
|
||||||
mmc1 = &sdhci;
|
mmc1 = &sdhci;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
|
compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdhci;
|
mmc0 = &sdhci;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdhci;
|
mmc0 = &sdhci;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdio0;
|
mmc0 = &sdio0;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
mmc2 = &sdhci;
|
mmc2 = &sdhci;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
|
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdmmc;
|
mmc0 = &sdmmc;
|
||||||
mmc1 = &sdhci;
|
mmc1 = &sdhci;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
#size-cells = <2>;
|
#size-cells = <2>;
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
ethernet0 = &gmac;
|
|
||||||
gpio0 = &gpio0;
|
gpio0 = &gpio0;
|
||||||
gpio1 = &gpio1;
|
gpio1 = &gpio1;
|
||||||
gpio2 = &gpio2;
|
gpio2 = &gpio2;
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
|
compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
ethernet0 = &gmac;
|
||||||
mmc0 = &sdhci;
|
mmc0 = &sdhci;
|
||||||
mmc1 = &sdmmc;
|
mmc1 = &sdmmc;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user