Commit 1bcb5df8 authored by Jerry Ray's avatar Jerry Ray Committed by David S. Miller
Browse files

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: default avatarJerry Ray <jerry.ray@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9755126d

drivers/net/dsa/lan9303-core.c

+7 −9
Original line number Diff line number Diff line
@@ -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,