net: dsa: Centralize Marvell switch reset

Marvell switches are all reset in nearly the same way. The only
difference is if the PPU should be enabled or not. Move this
code into the shared mv88x6xxx.c.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 35 deletions

diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 6b818fde2216..534a8f0b1c28 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -42,40 +42,6 @@ static char *mv88e6131_probe(struct device *host_dev, int sw_addr)
         return NULL;
 }
 
-static int mv88e6131_switch_reset(struct dsa_switch *ds)
-{
-        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-        int i;
-        int ret;
-        unsigned long timeout;
-
-        /* Set all ports to the disabled state. */
-        for (i = 0; i < ps->num_ports; i++) {
-                ret = REG_READ(REG_PORT(i), 0x04);
-                REG_WRITE(REG_PORT(i), 0x04, ret & 0xfffc);
-        }
-
-        /* Wait for transmit queues to drain. */
-        usleep_range(2000, 4000);
-
-        /* Reset the switch. */
-        REG_WRITE(REG_GLOBAL, 0x04, 0xc400);
-
-        /* Wait up to one second for reset to complete. */
-        timeout = jiffies + 1 * HZ;
-        while (time_before(jiffies, timeout)) {
-                ret = REG_READ(REG_GLOBAL, 0x00);
-                if ((ret & 0xc800) == 0xc800)
-                        break;
-
-                usleep_range(1000, 2000);
-        }
-        if (time_after(jiffies, timeout))
-                return -ETIMEDOUT;
-
-        return 0;
-}
-
 static int mv88e6131_setup_global(struct dsa_switch *ds)
 {
         int ret;
@@ -281,7 +247,7 @@ static int mv88e6131_setup(struct dsa_switch *ds)
                 return -ENODEV;
         }
 
-        ret = mv88e6131_switch_reset(ds);
+        ret = mv88e6xxx_switch_reset(ds, false);
         if (ret < 0)
                 return ret;