diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-15 16:38:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-15 16:38:39 -0400 |
| commit | 2ef98d33166e5c22a61eba29c20e236b72f1e8a2 (patch) | |
| tree | 288afa85ba7134787f5c7146b0d87aaeb07d9b78 /drivers/net/4xx_enet.c | |
| parent | b064c9124acddbcdc70843f62fda13a2d7d7a392 (diff) | |
| parent | cc2593128f7ad1b879e9e5bd3097f6c717cf4c9a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/4xx_enet.c')
| -rw-r--r-- | drivers/net/4xx_enet.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index bc52ed35cc..b71848168a 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -283,10 +283,9 @@ static void mal_err (struct eth_device *dev, unsigned long isr, static void emac_err (struct eth_device *dev, unsigned long isr); extern int phy_setup_aneg (char *devname, unsigned char addr); -extern int emac4xx_miiphy_read (const char *devname, unsigned char addr, - unsigned char reg, unsigned short *value); -extern int emac4xx_miiphy_write (const char *devname, unsigned char addr, - unsigned char reg, unsigned short value); +int emac4xx_miiphy_read(struct mii_dev *bus, int addr, int devad, int reg); +int emac4xx_miiphy_write(struct mii_dev *bus, int addr, int devad, int reg, + u16 value); int board_emac_count(void); @@ -2015,8 +2014,17 @@ int ppc_4xx_eth_initialize (bd_t * bis) eth_register(dev); #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) - miiphy_register(dev->name, - emac4xx_miiphy_read, emac4xx_miiphy_write); + int retval; + struct mii_dev *mdiodev = mdio_alloc(); + if (!mdiodev) + return -ENOMEM; + strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + mdiodev->read = emac4xx_miiphy_read; + mdiodev->write = emac4xx_miiphy_write; + + retval = mdio_register(mdiodev); + if (retval < 0) + return retval; #endif if (0 == virgin) { |