Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22356476 authored Apr 17, 2016 by Vivien Didelot Committed by David S. Miller Apr 17, 2016

net: dsa: mv88e6xxx: add family to info



Add an mv88e6xxx_family enum to the info structure for better family
indentification.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f6271e67

drivers/net/dsa/mv88e6123.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,12 +20,15 @@
		static const struct mv88e6xxx_info mv88e6123_table[] = {
		{
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6123,
		.family = MV88E6XXX_FAMILY_6165,
		.name = "Marvell 88E6123",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6161,
		.family = MV88E6XXX_FAMILY_6165,
		.name = "Marvell 88E6161",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6165,
		.family = MV88E6XXX_FAMILY_6165,
		.name = "Marvell 88E6165",
		}
		};

drivers/net/dsa/mv88e6131.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,15 +20,19 @@
		static const struct mv88e6xxx_info mv88e6131_table[] = {
		{
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6095,
		.family = MV88E6XXX_FAMILY_6095,
		.name = "Marvell 88E6095/88E6095F",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6085,
		.family = MV88E6XXX_FAMILY_6097,
		.name = "Marvell 88E6085",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6131,
		.family = MV88E6XXX_FAMILY_6185,
		.name = "Marvell 88E6131",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6185,
		.family = MV88E6XXX_FAMILY_6185,
		.name = "Marvell 88E6185",
		}
		};

drivers/net/dsa/mv88e6171.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,15 +20,19 @@
		static const struct mv88e6xxx_info mv88e6171_table[] = {
		{
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6171,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6171",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6175,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6175",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6350,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6350",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6351,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6351",
		}
		};

drivers/net/dsa/mv88e6352.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,21 +25,27 @@
		static const struct mv88e6xxx_info mv88e6352_table[] = {
		{
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6320,
		.family = MV88E6XXX_FAMILY_6320,
		.name = "Marvell 88E6320",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6321,
		.family = MV88E6XXX_FAMILY_6320,
		.name = "Marvell 88E6321",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6172,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6172",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6176,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6176",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6240,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6240",
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6352,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6352",
		}
		};

drivers/net/dsa/mv88e6xxx.c

+8 −63

Original line number	Diff line number	Diff line
		@@ -402,111 +402,56 @@ static bool mv88e6xxx_6065_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6031:
		case PORT_SWITCH_ID_6061:
		case PORT_SWITCH_ID_6035:
		case PORT_SWITCH_ID_6065:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6065;
		}

		static bool mv88e6xxx_6095_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6092:
		case PORT_SWITCH_ID_6095:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6095;
		}

		static bool mv88e6xxx_6097_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6046:
		case PORT_SWITCH_ID_6085:
		case PORT_SWITCH_ID_6096:
		case PORT_SWITCH_ID_6097:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6097;
		}

		static bool mv88e6xxx_6165_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6123:
		case PORT_SWITCH_ID_6161:
		case PORT_SWITCH_ID_6165:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6165;
		}

		static bool mv88e6xxx_6185_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6121:
		case PORT_SWITCH_ID_6122:
		case PORT_SWITCH_ID_6152:
		case PORT_SWITCH_ID_6155:
		case PORT_SWITCH_ID_6182:
		case PORT_SWITCH_ID_6185:
		case PORT_SWITCH_ID_6108:
		case PORT_SWITCH_ID_6131:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6185;
		}

		static bool mv88e6xxx_6320_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6320:
		case PORT_SWITCH_ID_6321:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6320;
		}

		static bool mv88e6xxx_6351_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6171:
		case PORT_SWITCH_ID_6175:
		case PORT_SWITCH_ID_6350:
		case PORT_SWITCH_ID_6351:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6351;
		}

		static bool mv88e6xxx_6352_family(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		switch (ps->id) {
		case PORT_SWITCH_ID_6172:
		case PORT_SWITCH_ID_6176:
		case PORT_SWITCH_ID_6240:
		case PORT_SWITCH_ID_6352:
		return true;
		}
		return false;
		return ps->info->family == MV88E6XXX_FAMILY_6352;
		}

		static unsigned int mv88e6xxx_num_databases(struct dsa_switch *ds)