test/py: fs: add fstest/unlink test

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

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 4296550a6d7beae1228c2395d9c660092b00734a..dac07b6e34d24c26c8b39fcc13e631d5bd372f36 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009 Ilya Yanok, Emcraft Systems Ltd <yanok@emcraft.com>
  * (C) Copyright 2008,2009 Eric Jarrige <eric.jarrige@armadeus.org>
  * (C) Copyright 2008 Armadeus Systems nc
  * (C) Copyright 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
  * (C) Copyright 2007 Pengutronix, Juergen Beisert <j.beisert@pengutronix.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -16,7 +15,6 @@
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
-#include "fec_mxc.h"
 
 #include <asm/io.h>
 #include <linux/errno.h>
@@ -25,6 +23,9 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <asm-generic/gpio.h>
+
+#include "fec_mxc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -1230,7 +1231,7 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
        struct phy_device *phydev;
        int mask = 0xffffffff;
 
-#ifdef CONFIG_PHYLIB
+#ifdef CONFIG_FEC_MXC_PHYADDR
        mask = 1 << CONFIG_FEC_MXC_PHYADDR;
 #endif
 
@@ -1246,6 +1247,19 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
        return 0;
 }
 
+#ifdef CONFIG_DM_GPIO
+/* FEC GPIO reset */
+static void fec_gpio_reset(struct fec_priv *priv)
+{
+       debug("fec_gpio_reset: fec_gpio_reset(dev)\n");
+       if (dm_gpio_is_valid(&priv->phy_reset_gpio)) {
+               dm_gpio_set_value(&priv->phy_reset_gpio, 1);
+               udelay(priv->reset_delay);
+               dm_gpio_set_value(&priv->phy_reset_gpio, 0);
+       }
+}
+#endif
+
 static int fecmxc_probe(struct udevice *dev)
 {
        struct eth_pdata *pdata = dev_get_platdata(dev);
@@ -1258,6 +1272,9 @@ static int fecmxc_probe(struct udevice *dev)
        if (ret)
                return ret;
 
+#ifdef CONFIG_DM_GPIO
+       fec_gpio_reset(priv);
+#endif
        /* Reset chip. */
        writel(readl(&priv->eth->ecntrl) | FEC_ECNTRL_RESET,
               &priv->eth->ecntrl);
@@ -1292,12 +1309,11 @@ static int fecmxc_probe(struct udevice *dev)
 
        return 0;
 
-err_timeout:
-       free(priv->phydev);
 err_phy:
        mdio_unregister(bus);
        free(bus);
 err_mii:
+err_timeout:
        fec_free_descs(priv);
        return ret;
 }
@@ -1316,6 +1332,7 @@ static int fecmxc_remove(struct udevice *dev)
 
 static int fecmxc_ofdata_to_platdata(struct udevice *dev)
 {
+       int ret = 0;
        struct eth_pdata *pdata = dev_get_platdata(dev);
        struct fec_priv *priv = dev_get_priv(dev);
        const char *phy_mode;
@@ -1333,12 +1350,24 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev)
                return -EINVAL;
        }
 
-       /* TODO
-        * Need to get the reset-gpio and related properties from DT
-        * and implemet the enet reset code on .probe call
-        */
+#ifdef CONFIG_DM_GPIO
+       ret = gpio_request_by_name(dev, "phy-reset-gpios", 0,
+                            &priv->phy_reset_gpio, GPIOD_IS_OUT);
+       if (ret == 0) {
+               ret = dev_read_u32_array(dev, "phy-reset-duration",
+                                        &priv->reset_delay, 1);
+       } else if (ret == -ENOENT) {
+               priv->reset_delay = 1000;
+               ret = 0;
+       }
 
-       return 0;
+       if (priv->reset_delay > 1000) {
+               printf("FEX MXC: gpio reset timeout should be less the 1000\n");
+               priv->reset_delay = 1000;
+       }
+#endif
+
+       return ret;
 }
 
 static const struct udevice_id fecmxc_ids[] = {
@@ -1346,6 +1375,7 @@ static const struct udevice_id fecmxc_ids[] = {
        { .compatible = "fsl,imx6sl-fec" },
        { .compatible = "fsl,imx6sx-fec" },
        { .compatible = "fsl,imx6ul-fec" },
+       { .compatible = "fsl,imx53-fec" },
        { }
 };