Merge git://www.denx.de/git/u-boot-imx

[u-boot] / drivers / net / fec_mxc.c

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 4ad4ddc86602adf87f8c1efdbc1d6edb18536817..f16b2990d7ce4c56c6a45983cd7c5775bcbe670c 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -23,7 +23,7 @@
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -985,9 +985,18 @@ static void fec_free_descs(struct fec_priv *fec)
        free(fec->tbd_base);
 }
 
+#ifdef CONFIG_DM_ETH
+struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)
+#else
 struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)
+#endif
 {
+#ifdef CONFIG_DM_ETH
+       struct fec_priv *priv = dev_get_priv(dev);
+       struct ethernet_regs *eth = priv->eth;
+#else
        struct ethernet_regs *eth = (struct ethernet_regs *)base_addr;
+#endif
        struct mii_dev *bus;
        int ret;
 
@@ -1096,8 +1105,8 @@ static int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,
                        sprintf(mac, "eth%daddr", fec->dev_id);
                else
                        strcpy(mac, "ethaddr");
-               if (!getenv(mac))
-                       eth_setenv_enetaddr(mac, ethaddr);
+               if (!env_get(mac))
+                       eth_env_set_enetaddr(mac, ethaddr);
        }
        return ret;
 err4: