Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index ce0eacceb60adcfd51533f6bed972c0d3dc5d047..dc7a52534e5c86ba23b0a3238086cfe132d77947 100644 (file)
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
@@ -17,6 +18,7 @@
 #include <linux/mii.h>
 #include <wait_bit.h>
 #include <asm/io.h>
+#include <asm/gpio.h>
 
 /* Registers */
 #define RAVB_REG_CCC           0x000
@@ -120,6 +122,8 @@ struct ravb_priv {
        struct phy_device       *phydev;
        struct mii_dev          *bus;
        void __iomem            *iobase;
+       struct clk              clk;
+       struct gpio_desc        reset_gpio;
 };
 
 static inline void ravb_flush_dcache(u32 addr, u32 len)
@@ -300,6 +304,13 @@ static int ravb_phy_config(struct udevice *dev)
        struct phy_device *phydev;
        int mask = 0xffffffff, reg;
 
+       if (dm_gpio_is_valid(&eth->reset_gpio)) {
+               dm_gpio_set_value(&eth->reset_gpio, 1);
+               mdelay(20);
+               dm_gpio_set_value(&eth->reset_gpio, 0);
+               mdelay(1);
+       }
+
        phydev = phy_find_by_mask(eth->bus, mask, pdata->phy_interface);
        if (!phydev)
                return -ENODEV;
@@ -432,27 +443,38 @@ int ravb_start(struct udevice *dev)
        struct ravb_priv *eth = dev_get_priv(dev);
        int ret;
 
-       ret = ravb_reset(dev);
+       ret = clk_enable(&eth->clk);
        if (ret)
                return ret;
 
+       ret = ravb_reset(dev);
+       if (ret)
+               goto err;
+
        ravb_base_desc_init(eth);
        ravb_tx_desc_init(eth);
        ravb_rx_desc_init(eth);
 
        ret = ravb_config(dev);
        if (ret)
-               return ret;
+               goto err;
 
        /* Setting the control will start the AVB-DMAC process. */
        writel(CCC_OPC_OPERATION, eth->iobase + RAVB_REG_CCC);
 
        return 0;
+
+err:
+       clk_disable(&eth->clk);
+       return ret;
 }
 
 static void ravb_stop(struct udevice *dev)
 {
+       struct ravb_priv *eth = dev_get_priv(dev);
+
        ravb_reset(dev);
+       clk_disable(&eth->clk);
 }
 
 static int ravb_probe(struct udevice *dev)
@@ -466,6 +488,13 @@ static int ravb_probe(struct udevice *dev)
        iobase = map_physmem(pdata->iobase, 0x1000, MAP_NOCACHE);
        eth->iobase = iobase;
 
+       ret = clk_get_by_index(dev, 0, &eth->clk);
+       if (ret < 0)
+               goto err_mdio_alloc;
+
+       gpio_request_by_name_nodev(dev_ofnode(dev), "reset-gpios", 0,
+                                  &eth->reset_gpio, GPIOD_IS_OUT);
+
        mdiodev = mdio_alloc();
        if (!mdiodev) {
                ret = -ENOMEM;
@@ -499,6 +528,7 @@ static int ravb_remove(struct udevice *dev)
        free(eth->phydev);
        mdio_unregister(eth->bus);
        mdio_free(eth->bus);
+       dm_gpio_free(dev, &eth->reset_gpio);
        unmap_physmem(eth->iobase, MAP_NOCACHE);
 
        return 0;