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/bcm-sf2-eth-gmac.c | |
| parent | b064c9124acddbcdc70843f62fda13a2d7d7a392 (diff) | |
| parent | cc2593128f7ad1b879e9e5bd3097f6c717cf4c9a (diff) | |
| download | u-boot-imx-2ef98d33166e5c22a61eba29c20e236b72f1e8a2.zip u-boot-imx-2ef98d33166e5c22a61eba29c20e236b72f1e8a2.tar.gz u-boot-imx-2ef98d33166e5c22a61eba29c20e236b72f1e8a2.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/bcm-sf2-eth-gmac.c')
| -rw-r--r-- | drivers/net/bcm-sf2-eth-gmac.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c index 977feec..f2853cf 100644 --- a/drivers/net/bcm-sf2-eth-gmac.c +++ b/drivers/net/bcm-sf2-eth-gmac.c @@ -596,12 +596,10 @@ bool gmac_mii_busywait(unsigned int timeout) return tmp & (1 << GMAC_MII_BUSY_SHIFT); } -int gmac_miiphy_read(const char *devname, unsigned char phyaddr, - unsigned char reg, unsigned short *value) +int gmac_miiphy_read(struct mii_dev *bus, int phyaddr, int devad, int reg) { uint32_t tmp = 0; - - (void)devname; + u16 value = 0; /* Busy wait timeout is 1ms */ if (gmac_mii_busywait(1000)) { @@ -621,18 +619,16 @@ int gmac_miiphy_read(const char *devname, unsigned char phyaddr, return -1; } - *value = readl(GMAC_MII_DATA_ADDR) & 0xffff; - debug("MII read data 0x%x\n", *value); - return 0; + value = readl(GMAC_MII_DATA_ADDR) & 0xffff; + debug("MII read data 0x%x\n", value); + return value; } -int gmac_miiphy_write(const char *devname, unsigned char phyaddr, - unsigned char reg, unsigned short value) +int gmac_miiphy_write(struct mii_dev *bus, int phyaddr, int devad, int reg, + u16 value) { uint32_t tmp = 0; - (void)devname; - /* Busy wait timeout is 1ms */ if (gmac_mii_busywait(1000)) { error("%s: Prepare MII write: MII/MDIO busy\n", __func__); |