hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: Report known silicon revisions for Marvell 88E6131 

Report known silicon revisions when probing Marvell 88E6131 switches.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guenter Roeck 2014-10-29 10:44:55 -07:00 committed by David S. Miller
parent 3de6aa4c35
commit a93e464a45
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/dsa/mv88e6131.c
View File

@ -21,6 +21,7 @@
#define ID_6085 0x04a0 #define ID_6085 0x04a0
#define ID_6095 0x0950 #define ID_6095 0x0950
#define ID_6131 0x1060 #define ID_6131 0x1060
#define ID_6131_B2 0x1066
static char *mv88e6131_probe(struct device *host_dev, int sw_addr) static char *mv88e6131_probe(struct device *host_dev, int sw_addr)
{ {
@ -32,12 +33,15 @@ static char *mv88e6131_probe(struct device *host_dev, int sw_addr)
ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03); ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03);
if (ret >= 0) { if (ret >= 0) {
ret &= 0xfff0; int ret_masked = ret & 0xfff0;
if (ret == ID_6085)
if (ret_masked == ID_6085)
return "Marvell 88E6085"; return "Marvell 88E6085";
if (ret == ID_6095) if (ret_masked == ID_6095)
return "Marvell 88E6095/88E6095F"; return "Marvell 88E6095/88E6095F";
if (ret == ID_6131) if (ret == ID_6131_B2)
return "Marvell 88E6131 (B2)";
if (ret_masked == ID_6131)
return "Marvell 88E6131"; return "Marvell 88E6131";
} }