diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-07 13:16:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-07 13:16:00 -0500 |
| commit | d8c4eb60f8d1af74116eaee4f53adc937e618d6f (patch) | |
| tree | ccdab4ffc0c3c32a1d788f33674f9f092830b7d0 /drivers/net/mvgbe.c | |
| parent | dac09fc10b71045ac261a9b8a05d34029ebec2ae (diff) | |
| parent | aa555fe9f07a21b3bbdab15aea594f3869e5ab22 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/mvgbe.c')
| -rw-r--r-- | drivers/net/mvgbe.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index c784cdcae26..f833efbe677 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -177,25 +177,6 @@ static int smi_reg_write(struct mii_dev *bus, int phy_adr, int devad, } #endif -#if defined(CONFIG_PHYLIB) -int mvgbe_phy_read(struct mii_dev *bus, int phy_addr, int dev_addr, - int reg_addr) -{ - u16 data; - int ret; - ret = smi_reg_read(bus->name, phy_addr, reg_addr, &data); - if (ret) - return ret; - return data; -} - -int mvgbe_phy_write(struct mii_dev *bus, int phy_addr, int dev_addr, - int reg_addr, u16 data) -{ - return smi_reg_write(bus->name, phy_addr, reg_addr, data); -} -#endif - /* Stop and checks all queues */ static void stop_queue(u32 * qreg) { @@ -676,8 +657,8 @@ int mvgbe_phylib_init(struct eth_device *dev, int phyid) printf("mdio_alloc failed\n"); return -ENOMEM; } - bus->read = mvgbe_phy_read; - bus->write = mvgbe_phy_write; + bus->read = smi_reg_read; + bus->write = smi_reg_write; strcpy(bus->name, dev->name); ret = mdio_register(bus); @@ -688,7 +669,7 @@ int mvgbe_phylib_init(struct eth_device *dev, int phyid) } /* Set phy address of the port */ - mvgbe_phy_write(bus, MV_PHY_ADR_REQUEST, 0, MV_PHY_ADR_REQUEST, phyid); + smi_reg_write(bus, MV_PHY_ADR_REQUEST, 0, MV_PHY_ADR_REQUEST, phyid); phydev = phy_connect(bus, phyid, dev, PHY_INTERFACE_MODE_RGMII); if (!phydev) { |