Commit a7470739 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'DP83869-Enhancements' 



Dan Murphy says:

====================
DP83869 Enhancements

These are improvements to the DP83869 Ethernet PHY driver.  OP-mode and port
mirroring may be strapped on the device but the software only retrives these
settings from the device tree.  Reading the straps and initializing the
associated stored variables so when setting the PHY up and down the PHY's
configuration values will be retained.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 59353266 0eaf8ccf

drivers/net/phy/dp83869.c

+32 −4
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ 
#define DP83869_RGMII_RX_CLK_DELAY_EN		BIT(0)



/* STRAP_STS1 bits */

#define DP83869_STRAP_OP_MODE_MASK		GENMASK(2, 0)

#define DP83869_STRAP_STS1_RESERVED		BIT(11)

#define DP83869_STRAP_MIRROR_ENABLED           BIT(12)



/* PHYCTRL bits */

#define DP83869_RX_FIFO_SHIFT	12
@@ -160,6 +162,20 @@ static int dp83869_config_port_mirroring(struct phy_device *phydev) 
					  DP83869_CFG3_PORT_MIRROR_EN);

}



static int dp83869_set_strapped_mode(struct phy_device *phydev)

{

	struct dp83869_private *dp83869 = phydev->priv;

	int val;



	val = phy_read_mmd(phydev, DP83869_DEVADDR, DP83869_STRAP_STS1);

	if (val < 0)

		return val;



	dp83869->mode = val & DP83869_STRAP_OP_MODE_MASK;



	return 0;

}



#ifdef CONFIG_OF_MDIO

static int dp83869_of_init(struct phy_device *phydev)

{
@@ -184,6 +200,10 @@ static int dp83869_of_init(struct phy_device *phydev) 
		if (dp83869->mode < DP83869_RGMII_COPPER_ETHERNET ||

		    dp83869->mode > DP83869_SGMII_COPPER_ETHERNET)

			return -EINVAL;

	} else {

		ret = dp83869_set_strapped_mode(phydev);

		if (ret)

			return ret;

	}



	if (of_property_read_bool(of_node, "ti,max-output-impedance"))
@@ -191,10 +211,18 @@ static int dp83869_of_init(struct phy_device *phydev) 
	else if (of_property_read_bool(of_node, "ti,min-output-impedance"))

		dp83869->io_impedance = DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN;



	if (of_property_read_bool(of_node, "enet-phy-lane-swap"))

	if (of_property_read_bool(of_node, "enet-phy-lane-swap")) {

		dp83869->port_mirroring = DP83869_PORT_MIRRORING_EN;

	} else {

		/* If the lane swap is not in the DT then check the straps */

		ret = phy_read_mmd(phydev, DP83869_DEVADDR, DP83869_STRAP_STS1);

		if (ret < 0)

			return ret;

		if (ret & DP83869_STRAP_MIRROR_ENABLED)

			dp83869->port_mirroring = DP83869_PORT_MIRRORING_EN;

		else

			dp83869->port_mirroring = DP83869_PORT_MIRRORING_DIS;

	}



	if (of_property_read_u32(of_node, "rx-fifo-depth",

				 &dp83869->rx_fifo_depth))
@@ -209,7 +237,7 @@ static int dp83869_of_init(struct phy_device *phydev) 
#else

static int dp83869_of_init(struct phy_device *phydev)

{

	return 0;

	return dp83869_set_strapped_mode(phydev);

}

#endif /* CONFIG_OF_MDIO */

CRA Git | Maintained and supported by SUSTech CRA and CCSE