Merge patch series "dwc3: gadget: properly fix cache operations"

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

diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index c74c8a81f9426a8630181f3868a1a35ef14b7b03..f1401d2f6ed2ea809479eca92836435f9ae88b9f 100644 (file)
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -8,7 +8,6 @@
  * Based on the SuperH Ethernet driver.
  */
 
-#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
@@ -131,7 +130,6 @@ struct ravb_priv {
        struct mii_dev          *bus;
        void __iomem            *iobase;
        struct clk_bulk         clks;
-       struct gpio_desc        reset_gpio;
 };
 
 static inline void ravb_flush_dcache(u32 addr, u32 len)
@@ -312,13 +310,6 @@ static int ravb_phy_config(struct udevice *dev)
        struct phy_device *phydev;
        int 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_connect(eth->bus, -1, dev, pdata->phy_interface);
        if (!phydev)
                return -ENODEV;
@@ -400,8 +391,8 @@ static int ravb_dmac_init(struct udevice *dev)
        writel(0x00222210, eth->iobase + RAVB_REG_TGC);
 
        /* Delay CLK: 2ns (not applicable on R-Car E3/D3) */
-       if ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77990) ||
-           (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77995))
+       if ((renesas_get_cpu_type() == RENESAS_CPU_TYPE_R8A77990) ||
+           (renesas_get_cpu_type() == RENESAS_CPU_TYPE_R8A77995))
                return 0;
 
        if (!dev_read_u32(dev, "rx-internal-delay-ps", &delay)) {
@@ -503,7 +494,6 @@ static int ravb_probe(struct udevice *dev)
 {
        struct eth_pdata *pdata = dev_get_plat(dev);
        struct ravb_priv *eth = dev_get_priv(dev);
-       struct ofnode_phandle_args phandle_args;
        struct mii_dev *mdiodev;
        void __iomem *iobase;
        int ret;
@@ -515,17 +505,6 @@ static int ravb_probe(struct udevice *dev)
        if (ret < 0)
                goto err_mdio_alloc;
 
-       ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, &phandle_args);
-       if (!ret) {
-               gpio_request_by_name_nodev(phandle_args.node, "reset-gpios", 0,
-                                          &eth->reset_gpio, GPIOD_IS_OUT);
-       }
-
-       if (!dm_gpio_is_valid(&eth->reset_gpio)) {
-               gpio_request_by_name(dev, "reset-gpios", 0, &eth->reset_gpio,
-                                    GPIOD_IS_OUT);
-       }
-
        mdiodev = mdio_alloc();
        if (!mdiodev) {
                ret = -ENOMEM;
@@ -576,8 +555,6 @@ static int ravb_remove(struct udevice *dev)
        free(eth->phydev);
        mdio_unregister(eth->bus);
        mdio_free(eth->bus);
-       if (dm_gpio_is_valid(&eth->reset_gpio))
-               dm_gpio_free(dev, &eth->reset_gpio);
        unmap_physmem(eth->iobase, MAP_NOCACHE);
 
        return 0;