Commit a93e464a authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller
Browse files

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



Report known silicon revisions when probing Marvell 88E6131 switches.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3de6aa4c

drivers/net/dsa/mv88e6131.c

+8 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define ID_6085		0x04a0

#define ID_6095		0x0950

#define ID_6131		0x1060

#define ID_6131_B2	0x1066



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);

	if (ret >= 0) {

		ret &= 0xfff0;

		if (ret == ID_6085)

		int ret_masked = ret & 0xfff0;



		if (ret_masked == ID_6085)

			return "Marvell 88E6085";

		if (ret == ID_6095)

		if (ret_masked == ID_6095)

			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";

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE