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>

6 files changed, 38 insertions, 63 deletions

diff --git a/drivers/net/dsa/mv88e6123.c b/drivers/net/dsa/mv88e6123.c
index 62dffcf915a7..776e6ef3e29c 100644
--- a/drivers/net/dsa/mv88e6123.c
+++ b/drivers/net/dsa/mv88e6123.c
@@ -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",
         }
 };
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 00567156f335..1986651ac054 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -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",
         }
 };
diff --git a/drivers/net/dsa/mv88e6171.c b/drivers/net/dsa/mv88e6171.c
index ea14ab22d313..9a3b1e19b01a 100644
--- a/drivers/net/dsa/mv88e6171.c
+++ b/drivers/net/dsa/mv88e6171.c
@@ -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",
         }
 };
diff --git a/drivers/net/dsa/mv88e6352.c b/drivers/net/dsa/mv88e6352.c
index 2f72606ecc9e..bae62eb9c3b5 100644
--- a/drivers/net/dsa/mv88e6352.c
+++ b/drivers/net/dsa/mv88e6352.c
@@ -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",
         }
 };
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 5fb21e059f35..8f8a1cf59fda 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -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)
diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index b87f574a84de..b4eec9a8c8ff 100644
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
@@ -369,7 +369,20 @@
 
 #define MV88E6XXX_N_FID         4096
 
+enum mv88e6xxx_family {
+        MV88E6XXX_FAMILY_NONE,
+        MV88E6XXX_FAMILY_6065,  /* 6031 6035 6061 6065 */
+        MV88E6XXX_FAMILY_6095,  /* 6092 6095 */
+        MV88E6XXX_FAMILY_6097,  /* 6046 6085 6096 6097 */
+        MV88E6XXX_FAMILY_6165,  /* 6123 6161 6165 */
+        MV88E6XXX_FAMILY_6185,  /* 6108 6121 6122 6131 6152 6155 6182 6185 */
+        MV88E6XXX_FAMILY_6320,  /* 6320 6321 */
+        MV88E6XXX_FAMILY_6351,  /* 6171 6175 6350 6351 */
+        MV88E6XXX_FAMILY_6352,  /* 6172 6176 6240 6352 */
+};
+
 struct mv88e6xxx_info {
+        enum mv88e6xxx_family family;
         u16 prod_num;
         const char *name;
 };