Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh

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

diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index ab45a31d6a60a04b2d00b0c4eefc1b2e60110daa..093288b639fb44d635a063765570df4ac290b9b1 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)
@@ -218,8 +222,8 @@ static int ravb_reset(struct udevice *dev)
        writel(CCC_OPC_CONFIG, eth->iobase + RAVB_REG_CCC);
 
        /* Check the operating mode is changed to the config mode. */
-       return wait_for_bit(dev->name, (void *)eth->iobase + RAVB_REG_CSR,
-                           CSR_OPS_CONFIG, true, 100, true);
+       return wait_for_bit_le32(eth->iobase + RAVB_REG_CSR,
+                                CSR_OPS_CONFIG, true, 100, true);
 }
 
 static void ravb_base_desc_init(struct ravb_priv *eth)
@@ -298,13 +302,21 @@ static int ravb_phy_config(struct udevice *dev)
        struct ravb_priv *eth = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
        struct phy_device *phydev;
-       int reg;
+       int mask = 0xffffffff, reg;
 
-       phydev = phy_connect(eth->bus, pdata->phy_interface,
-                            dev, PHY_INTERFACE_MODE_RGMII_ID);
+       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;
 
+       phy_connect_dev(phydev, dev);
+
        eth->phydev = phydev;
 
        /* 10BASE is not supported for Ethernet AVB MAC */
@@ -426,32 +438,43 @@ static int ravb_config(struct udevice *dev)
        return 0;
 }
 
-int ravb_start(struct udevice *dev)
+static 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)
@@ -465,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(dev, "reset-gpios", 0, &eth->reset_gpio,
+                            GPIOD_IS_OUT);
+
        mdiodev = mdio_alloc();
        if (!mdiodev) {
                ret = -ENOMEM;
@@ -498,6 +528,8 @@ 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;
@@ -589,9 +621,48 @@ static const struct eth_ops ravb_ops = {
        .write_hwaddr           = ravb_write_hwaddr,
 };
 
+int ravb_ofdata_to_platdata(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+       const char *phy_mode;
+       const fdt32_t *cell;
+       int ret = 0;
+
+       pdata->iobase = devfdt_get_addr(dev);
+       pdata->phy_interface = -1;
+       phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
+                              NULL);
+       if (phy_mode)
+               pdata->phy_interface = phy_get_interface_by_name(phy_mode);
+       if (pdata->phy_interface == -1) {
+               debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
+               return -EINVAL;
+       }
+
+       pdata->max_speed = 1000;
+       cell = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "max-speed", NULL);
+       if (cell)
+               pdata->max_speed = fdt32_to_cpu(*cell);
+
+       sprintf(bb_miiphy_buses[0].name, dev->name);
+
+       return ret;
+}
+
+static const struct udevice_id ravb_ids[] = {
+       { .compatible = "renesas,etheravb-r8a7795" },
+       { .compatible = "renesas,etheravb-r8a7796" },
+       { .compatible = "renesas,etheravb-r8a77970" },
+       { .compatible = "renesas,etheravb-r8a77995" },
+       { .compatible = "renesas,etheravb-rcar-gen3" },
+       { }
+};
+
 U_BOOT_DRIVER(eth_ravb) = {
        .name           = "ravb",
        .id             = UCLASS_ETH,
+       .of_match       = ravb_ids,
+       .ofdata_to_platdata = ravb_ofdata_to_platdata,
        .probe          = ravb_probe,
        .remove         = ravb_remove,
        .ops            = &ravb_ops,