diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-09 07:56:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-09 07:56:54 -0500 |
| commit | 361a879902a3cbdb692149a1ac580e3199e771ba (patch) | |
| tree | 22d8f65bdf2e41096d13f2bfd458fb25b3c3698d /drivers/net | |
| parent | 3edc0c252257e4afed163a3a74aba24a5509b198 (diff) | |
| download | u-boot-imx-361a879902a3cbdb692149a1ac580e3199e771ba.zip u-boot-imx-361a879902a3cbdb692149a1ac580e3199e771ba.tar.gz u-boot-imx-361a879902a3cbdb692149a1ac580e3199e771ba.tar.bz2 | |
Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"
This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing
changes made to bb135a0180c31fbd7456021fb9700b49bba7f533.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/xilinx_axi_emac.c | 3 | ||||
| -rw-r--r-- | drivers/net/xilinx_emaclite.c | 3 | ||||
| -rw-r--r-- | drivers/net/zynq_gem.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 51c7426..5de06ef 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -648,8 +648,9 @@ static int axi_emac_probe(struct udevice *dev) priv->bus->read = axiemac_miiphy_read; priv->bus->write = axiemac_miiphy_write; priv->bus->priv = priv; + strcpy(priv->bus->name, "axi_emac"); - ret = mdio_register_seq(priv->bus, dev->seq); + ret = mdio_register(priv->bus); if (ret) return ret; diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index ea93cf9..78ff44c 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -566,8 +566,9 @@ static int emaclite_probe(struct udevice *dev) emaclite->bus->read = emaclite_miiphy_read; emaclite->bus->write = emaclite_miiphy_write; emaclite->bus->priv = emaclite; + strcpy(emaclite->bus->name, "emaclite"); - ret = mdio_register_seq(emaclite->bus, dev->seq); + ret = mdio_register(emaclite->bus); if (ret) return ret; diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 4ab7b40..526eac6 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -647,8 +647,9 @@ static int zynq_gem_probe(struct udevice *dev) priv->bus->read = zynq_gem_miiphy_read; priv->bus->write = zynq_gem_miiphy_write; priv->bus->priv = priv; + strcpy(priv->bus->name, "gem"); - ret = mdio_register_seq_name(priv->bus, dev->seq); + ret = mdio_register(priv->bus); if (ret) return ret; |