From: Ralph Siemsen Date: Mon, 19 Aug 2019 18:43:13 +0000 (-0400) Subject: net: designware: drop compatible altr, socfpga-stmmac X-Git-Tag: v2019.10-rc4~22^2~10 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=642b80d256e1ba35e0dc8157a588b49c11b177f4;p=oweals%2Fu-boot.git net: designware: drop compatible altr, socfpga-stmmac The same compatible = "altr,socfpga-stmmac" appears in both drivers/net/designware.c and drivers/net/dwmac_socfgpa.c, creating ambiguity in which driver will be bound. For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver. So drop the compatible string from designware.c. Signed-off-by: Ralph Siemsen Reviewed-by: Simon Goldschmidt Acked-by: Joe Hershberger --- diff --git a/drivers/net/designware.c b/drivers/net/designware.c index c4fe40b19a..145eeac45f 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -847,7 +847,6 @@ int designware_eth_ofdata_to_platdata(struct udevice *dev) static const struct udevice_id designware_eth_ids[] = { { .compatible = "allwinner,sun7i-a20-gmac" }, - { .compatible = "altr,socfpga-stmmac" }, { .compatible = "amlogic,meson6-dwmac" }, { .compatible = "amlogic,meson-gx-dwmac" }, { .compatible = "amlogic,meson-gxbb-dwmac" },