dsa: lan9303: move Turbo Mode bit init

In preparing to remove the .adjust_link api, I am moving the one-time
initialization of the device's Turbo Mode bit into a different execution
path. This code clears (disables) the Turbo Mode bit which is never used
by this driver. Turbo Mode is a non-standard mode that would allow the
100Mbps RMII interface to run at 200Mbps.

Signed-off-by: Jerry Ray <jerry.ray@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
index f8f6f79052e3bee4a4b742e241abb67506ff10ab..63f5c1ef65e264939f03b26deea22c0b23d96f50 100644 (file)
--- a/drivers/net/dsa/lan9303-core.c
+++ b/drivers/net/dsa/lan9303-core.c
@@ -902,6 +902,7 @@ static int lan9303_setup(struct dsa_switch *ds)
 {
        struct lan9303 *chip = ds->priv;
        int ret;
+       u32 reg;
 
        /* Make sure that port 0 is the cpu port */
        if (!dsa_is_cpu_port(ds, 0)) {
@@ -909,6 +910,12 @@ static int lan9303_setup(struct dsa_switch *ds)
                return -EINVAL;
        }
 
+       /* Virtual Phy: Remove Turbo 200Mbit mode */
+       lan9303_read(chip->regmap, LAN9303_VIRT_SPECIAL_CTRL, &reg);
+
+       reg &= ~LAN9303_VIRT_SPECIAL_TURBO;
+       regmap_write(chip->regmap, LAN9303_VIRT_SPECIAL_CTRL, reg);
+
        ret = lan9303_setup_tagging(chip);
        if (ret)
                dev_err(chip->dev, "failed to setup port tagging %d\n", ret);
@@ -1052,7 +1059,6 @@ static int lan9303_phy_write(struct dsa_switch *ds, int phy, int regnum,
 static void lan9303_adjust_link(struct dsa_switch *ds, int port,
                                struct phy_device *phydev)
 {
-       struct lan9303 *chip = ds->priv;
        int ctl;
 
        if (!phy_is_pseudo_fixed_link(phydev))
@@ -1075,14 +1081,6 @@ static void lan9303_adjust_link(struct dsa_switch *ds, int port,
                ctl &= ~BMCR_FULLDPLX;
 
        lan9303_phy_write(ds, port, MII_BMCR, ctl);
-
-       if (port == chip->phy_addr_base) {
-               /* Virtual Phy: Remove Turbo 200Mbit mode */
-               lan9303_read(chip->regmap, LAN9303_VIRT_SPECIAL_CTRL, &ctl);
-
-               ctl &= ~LAN9303_VIRT_SPECIAL_TURBO;
-               regmap_write(chip->regmap, LAN9303_VIRT_SPECIAL_CTRL, ctl);
-       }
 }
 
 static int lan9303_port_enable(struct dsa_switch *ds, int port,