net: dsa: mv88e6xxx: lookup switch name

[karo-tx-linux.git] / drivers / net / dsa / mv88e6352.c

diff --git a/drivers/net/dsa/mv88e6352.c b/drivers/net/dsa/mv88e6352.c
index 1f5129c105fb3cce995527104b049ebf6e89abac..ff846d0cfcebeff1b332b8f8ae1ca48d106c667d 100644 (file)
--- a/drivers/net/dsa/mv88e6352.c
+++ b/drivers/net/dsa/mv88e6352.c
@@ -22,41 +22,24 @@
 #include <net/dsa.h>
 #include "mv88e6xxx.h"
 
+static const struct mv88e6xxx_switch_id mv88e6352_table[] = {
+       { PORT_SWITCH_ID_6172, "Marvell 88E6172" },
+       { PORT_SWITCH_ID_6176, "Marvell 88E6176" },
+       { PORT_SWITCH_ID_6320, "Marvell 88E6320" },
+       { PORT_SWITCH_ID_6320_A1, "Marvell 88E6320 (A1)" },
+       { PORT_SWITCH_ID_6320_A2, "Marvell 88e6320 (A2)" },
+       { PORT_SWITCH_ID_6321, "Marvell 88E6321" },
+       { PORT_SWITCH_ID_6321_A1, "Marvell 88E6321 (A1)" },
+       { PORT_SWITCH_ID_6321_A2, "Marvell 88e6321 (A2)" },
+       { PORT_SWITCH_ID_6352, "Marvell 88E6352" },
+       { PORT_SWITCH_ID_6352_A0, "Marvell 88E6352 (A0)" },
+       { PORT_SWITCH_ID_6352_A1, "Marvell 88E6352 (A1)" },
+};
+
 static char *mv88e6352_probe(struct device *host_dev, int sw_addr)
 {
-       struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev);
-       int ret;
-
-       if (bus == NULL)
-               return NULL;
-
-       ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), PORT_SWITCH_ID);
-       if (ret >= 0) {
-               if ((ret & 0xfff0) == PORT_SWITCH_ID_6172)
-                       return "Marvell 88E6172";
-               if ((ret & 0xfff0) == PORT_SWITCH_ID_6176)
-                       return "Marvell 88E6176";
-               if (ret == PORT_SWITCH_ID_6320_A1)
-                       return "Marvell 88E6320 (A1)";
-               if (ret == PORT_SWITCH_ID_6320_A2)
-                       return "Marvell 88e6320 (A2)";
-               if ((ret & 0xfff0) == PORT_SWITCH_ID_6320)
-                       return "Marvell 88E6320";
-               if (ret == PORT_SWITCH_ID_6321_A1)
-                       return "Marvell 88E6321 (A1)";
-               if (ret == PORT_SWITCH_ID_6321_A2)
-                       return "Marvell 88e6321 (A2)";
-               if ((ret & 0xfff0) == PORT_SWITCH_ID_6321)
-                       return "Marvell 88E6321";
-               if (ret == PORT_SWITCH_ID_6352_A0)
-                       return "Marvell 88E6352 (A0)";
-               if (ret == PORT_SWITCH_ID_6352_A1)
-                       return "Marvell 88E6352 (A1)";
-               if ((ret & 0xfff0) == PORT_SWITCH_ID_6352)
-                       return "Marvell 88E6352";
-       }
-
-       return NULL;
+       return mv88e6xxx_lookup_name(host_dev, sw_addr, mv88e6352_table,
+                                    ARRAY_SIZE(mv88e6352_table));
 }
 
 static int mv88e6352_setup_global(struct dsa_switch *ds)
@@ -324,7 +307,6 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
        .set_addr               = mv88e6xxx_set_addr_indirect,
        .phy_read               = mv88e6xxx_phy_read_indirect,
        .phy_write              = mv88e6xxx_phy_write_indirect,
-       .poll_link              = mv88e6xxx_poll_link,
        .get_strings            = mv88e6xxx_get_strings,
        .get_ethtool_stats      = mv88e6xxx_get_ethtool_stats,
        .get_sset_count         = mv88e6xxx_get_sset_count,
@@ -341,17 +323,16 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
        .set_eeprom             = mv88e6352_set_eeprom,
        .get_regs_len           = mv88e6xxx_get_regs_len,
        .get_regs               = mv88e6xxx_get_regs,
-       .port_join_bridge       = mv88e6xxx_join_bridge,
-       .port_leave_bridge      = mv88e6xxx_leave_bridge,
        .port_stp_update        = mv88e6xxx_port_stp_update,
        .port_pvid_get          = mv88e6xxx_port_pvid_get,
-       .port_pvid_set          = mv88e6xxx_port_pvid_set,
+       .port_vlan_prepare      = mv88e6xxx_port_vlan_prepare,
        .port_vlan_add          = mv88e6xxx_port_vlan_add,
        .port_vlan_del          = mv88e6xxx_port_vlan_del,
        .vlan_getnext           = mv88e6xxx_vlan_getnext,
+       .port_fdb_prepare       = mv88e6xxx_port_fdb_prepare,
        .port_fdb_add           = mv88e6xxx_port_fdb_add,
        .port_fdb_del           = mv88e6xxx_port_fdb_del,
-       .port_fdb_getnext       = mv88e6xxx_port_fdb_getnext,
+       .port_fdb_dump          = mv88e6xxx_port_fdb_dump,
 };
 
 MODULE_ALIAS("platform:mv88e6172");