Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dsa/mv88e6060: support nonzero mii base address

Browse source 
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>
This commit is contained in:
Peter Korsgaard 2011-03-07 05:49:47 +00:00 • committed by David S. Miller
parent c01c6af84e
commit fdb838cdae
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/dsa/mv88e6060.c
View file

@ -18,7 +18,7 @@
static int reg_read(struct dsa_switch *ds, int addr, int reg) 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) \ #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) 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) \ #define REG_WRITE(addr, reg, val) \
@ -50,7 +51,7 @@ static char *mv88e6060_probe(struct mii_bus *bus, int sw_addr)
{ {
int ret; int ret;
ret = mdiobus_read(bus, REG_PORT(0), 0x03); ret = mdiobus_read(bus, sw_addr + REG_PORT(0), 0x03);
if (ret >= 0) { if (ret >= 0) {
ret &= 0xfff0; ret &= 0xfff0;
if (ret == 0x0600) if (ret == 0x0600)