]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: dsa: Report known silicon revisions for Marvell 88E6060
authorGuenter Roeck <linux@roeck-us.net>
Wed, 29 Oct 2014 17:44:54 +0000 (10:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Oct 2014 18:54:10 +0000 (14:54 -0400)
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>
drivers/net/dsa/mv88e6060.c

index 05b0ca3bf71d72f11515241f0cfac14ea1f2c4a6..c29aebe1e62b59801ca7bb2aed36f9c502733fbf 100644 (file)
@@ -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";
        }