| Message ID | dda6662e-9461-9505-e014-f70674edf591@gmail.com |
|---|---|
| State | Accepted |
| Commit | 655217d |
| Delegated to: | Joe Hershberger |
| Headers | show |
On Fri, Jan 27, 2017 at 2:25 PM, Heiner Kallweit <hkallweit1@gmail.com> wrote: > 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 Uboot > (planned as prerequisite for adding Meson GX MMC driver to Uboot) 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>
Hi Heiner, https://patchwork.ozlabs.org/patch/720901/ was applied to u-boot-net.git. Thanks! -Joe
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index f242fc6..d519b87 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -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" }, { } };
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 Uboot (planned as prerequisite for adding Meson GX MMC driver to Uboot) add "amlogic,meson-gx-dwmac" to the compatibility list in the designware driver. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/designware.c | 1 + 1 file changed, 1 insertion(+)