]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
net: dsa: mv88e6131: Add support for mv88e6185
authorAndrew Lunn <andrew@lunn.ch>
Tue, 5 May 2015 23:09:52 +0000 (01:09 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2015 20:05:53 +0000 (16:05 -0400)
The mv88e6185 is part of the family that the mv88e6131 driver
supports. Add it to the probe function, and set the number of ports.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6131.c

index 765de63f59bdca50ec734d1caec140c7c6874e4e..32f4a08e9bc99dce2fa59af8cae8b34475bb24d6 100644 (file)
@@ -37,6 +37,8 @@ static char *mv88e6131_probe(struct device *host_dev, int sw_addr)
                        return "Marvell 88E6131 (B2)";
                if (ret_masked == PORT_SWITCH_ID_6131)
                        return "Marvell 88E6131";
+               if (ret_masked == PORT_SWITCH_ID_6185)
+                       return "Marvell 88E6185";
        }
 
        return NULL;
@@ -110,6 +112,7 @@ static int mv88e6131_setup(struct dsa_switch *ds)
 
        switch (ps->id) {
        case PORT_SWITCH_ID_6085:
+       case PORT_SWITCH_ID_6185:
                ps->num_ports = 10;
                break;
        case PORT_SWITCH_ID_6095: