]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
net: designware: Fix for use with current Linux device tree for Meson GX
authorHeiner Kallweit <hkallweit1@gmail.com>
Fri, 27 Jan 2017 20:25:59 +0000 (21:25 +0100)
committerJoe Hershberger <joe.hershberger@ni.com>
Tue, 7 Feb 2017 16:54:34 +0000 (10:54 -0600)
In Uboot for Meson GX the compatible string in meson-gxbb.dtsi so far is:
compatible = "amlogic,meson6-dwmac", "snps,dwmac";

On Linux in the same dt file it's
compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";

To avoid breaking ethernet with the next DT synch from Linux to U-Boot
(planned as prerequisite for adding Meson GX MMC driver to U-Boot) add
"amlogic,meson-gx-dwmac" to the compatibility list in the designware
driver.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
drivers/net/designware.c

index e207bc63b837fbc60db485642f49613bd8f6b1f9..a8e2a92def8c510e08d5f5b4c87e941637f6a1a5 100644 (file)
@@ -763,6 +763,7 @@ 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 = "st,stm32-dwmac" },
        { }
 };