Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266397
b: refs/heads/master
c: 76231e0
h: refs/heads/master
i:
  266395: fc05f85
v: v3
  • Loading branch information
David Daney authored and David S. Miller committed Sep 30, 2011
1 parent 8552969 commit 6fa9c5d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6fe3264945ee63292cdfb27b6e95bc52c603bb09
refs/heads/master: 76231e0297db30f1f0e947a02b42495e7d535d56
14 changes: 7 additions & 7 deletions trunk/drivers/net/phy/icplus.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,36 +49,36 @@ static int ip175c_config_init(struct phy_device *phydev)
if (full_reset_performed == 0) {

/* master reset */
err = phydev->bus->write(phydev->bus, 30, 0, 0x175c);
err = mdiobus_write(phydev->bus, 30, 0, 0x175c);
if (err < 0)
return err;

/* ensure no bus delays overlap reset period */
err = phydev->bus->read(phydev->bus, 30, 0);
err = mdiobus_read(phydev->bus, 30, 0);

/* data sheet specifies reset period is 2 msec */
mdelay(2);

/* enable IP175C mode */
err = phydev->bus->write(phydev->bus, 29, 31, 0x175c);
err = mdiobus_write(phydev->bus, 29, 31, 0x175c);
if (err < 0)
return err;

/* Set MII0 speed and duplex (in PHY mode) */
err = phydev->bus->write(phydev->bus, 29, 22, 0x420);
err = mdiobus_write(phydev->bus, 29, 22, 0x420);
if (err < 0)
return err;

/* reset switch ports */
for (i = 0; i < 5; i++) {
err = phydev->bus->write(phydev->bus, i,
MII_BMCR, BMCR_RESET);
err = mdiobus_write(phydev->bus, i,
MII_BMCR, BMCR_RESET);
if (err < 0)
return err;
}

for (i = 0; i < 5; i++)
err = phydev->bus->read(phydev->bus, i, MII_BMCR);
err = mdiobus_read(phydev->bus, i, MII_BMCR);

mdelay(2);

Expand Down

0 comments on commit 6fa9c5d

Please sign in to comment.