aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa/mv88e6060.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2014-10-29 10:44:54 -0700
committerDavid S. Miller <davem@davemloft.net>2014-10-30 14:54:10 -0400
commit3de6aa4c35eaa917b47a387a4092bd53f7afca4b (patch)
treefb67d1c17fe4f92c8ef43c2e97b1909e6be052bb /drivers/net/dsa/mv88e6060.c
parentnet: dsa: Don't set skb->protocol on outgoing tagged packets (diff)
downloadlinux-dev-3de6aa4c35eaa917b47a387a4092bd53f7afca4b.tar.xz
linux-dev-3de6aa4c35eaa917b47a387a4092bd53f7afca4b.zip
net: dsa: Report known silicon revisions for Marvell 88E6060
Report known silicon revisions when probing Marvell 88E6060 switches. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6060.c')
-rw-r--r--drivers/net/dsa/mv88e6060.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 05b0ca3bf71d..c29aebe1e62b 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -69,8 +69,11 @@ static char *mv88e6060_probe(struct device *host_dev, int sw_addr)
ret = mdiobus_read(bus, sw_addr + REG_PORT(0), 0x03);
if (ret >= 0) {
- ret &= 0xfff0;
if (ret == 0x0600)
+ return "Marvell 88E6060 (A0)";
+ if (ret == 0x0601 || ret == 0x0602)
+ return "Marvell 88E6060 (B0)";
+ if ((ret & 0xfff0) == 0x0600)
return "Marvell 88E6060";
}