diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-03-07 05:49:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-08 14:24:20 -0800 |
| commit | fdb838cdae4d4f2a478e5cfdd84026f7960b69dd (patch) | |
| tree | e61fa3c8515f41770af377fd1bfc35c20c01bf4a | |
| parent | c01c6af84e5c397917496212f8c3f2942ec7012d (diff) | |
| download | linux-fdb838cdae4d4f2a478e5cfdd84026f7960b69dd.tar.gz linux-fdb838cdae4d4f2a478e5cfdd84026f7960b69dd.tar.bz2 linux-fdb838cdae4d4f2a478e5cfdd84026f7960b69dd.zip | |
dsa/mv88e6060: support nonzero mii base address
The mv88e6060 uses either the lower 16 or upper 16 mii addresses,
depending on the value of the EE_CLK/ADDR4 pin. Support both
configurations by using the sw_addr setting as base address.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dsa/mv88e6060.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/dsa/mv88e6060.c b/net/dsa/mv88e6060.c index 83277f463af7..8f4ff5a2c813 100644 --- a/net/dsa/mv88e6060.c +++ b/net/dsa/mv88e6060.c @@ -18,7 +18,7 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg) { - return mdiobus_read(ds->master_mii_bus, addr, reg); + return mdiobus_read(ds->master_mii_bus, ds->pd->sw_addr + addr, reg); } #define REG_READ(addr, reg) \ @@ -34,7 +34,8 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg) static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val) { - return mdiobus_write(ds->master_mii_bus, addr, reg, val); + return mdiobus_write(ds->master_mii_bus, ds->pd->sw_addr + addr, + reg, val); } #define REG_WRITE(addr, reg, val) \ @@ -50,7 +51,7 @@ static char *mv88e6060_probe(struct mii_bus *bus, int sw_addr) { int ret; - ret = mdiobus_read(bus, REG_PORT(0), 0x03); + ret = mdiobus_read(bus, sw_addr + REG_PORT(0), 0x03); if (ret >= 0) { ret &= 0xfff0; if (ret == 0x0600) |