Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u...

[platform/kernel/u-boot.git] / drivers / net / dwc_eth_qos.c

diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 789ac2e..1d9eefb 100644 (file)
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -48,6 +48,7 @@
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/sys_proto.h>
 #endif
+#include <linux/bitops.h>
 #include <linux/delay.h>
 
 /* Core registers */
@@ -1994,9 +1995,9 @@ static int eqos_probe(struct udevice *dev)
        eqos->dev = dev;
        eqos->config = (void *)dev_get_driver_data(dev);
 
-       eqos->regs = devfdt_get_addr(dev);
+       eqos->regs = dev_read_addr(dev);
        if (eqos->regs == FDT_ADDR_T_NONE) {
-               pr_err("devfdt_get_addr() failed");
+               pr_err("dev_read_addr() failed");
                return -ENODEV;
        }
        eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE);
@@ -2169,7 +2170,7 @@ static const struct udevice_id eqos_ids[] = {
                .data = (ulong)&eqos_tegra186_config
        },
        {
-               .compatible = "snps,dwmac-4.20a",
+               .compatible = "st,stm32mp1-dwmac",
                .data = (ulong)&eqos_stm32_config
        },
        {