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

Merge branch 'phy-micrel' 



Jaeden Amero says:

====================
net/phy: micrel: Center FLP timing at 16ms

In v2, we add an additional cleanup commit to make an array of strings
static const and to improve const correctness generally. We also no longer
unnecessarily initialize the result variable in
ksz9031_center_flp_timing().

In v3, we remove the unnecessary result variable from ksz9031_config_init()
introduced by a previous version of "net/phy: micrel: Center FLP timing at
16ms".

In v4, we modify the commit message of "net/phy: micrel: Center FLP timing
at 16ms" to replace the awkward quotation of the data sheet's programming
procedure with an explanation of why we program the FLP burst registers and
restart auto-negotiation where we do (config_init).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f38b24c9 6270e1ae

drivers/net/phy/micrel.c

+38 −15
Original line number Diff line number Diff line
@@ -288,9 +288,10 @@ static int kszphy_config_init(struct phy_device *phydev) 
}



static int ksz9021_load_values_from_of(struct phy_device *phydev,

				       struct device_node *of_node, u16 reg,

				       char *field1, char *field2,

				       char *field3, char *field4)

				       const struct device_node *of_node,

				       u16 reg,

				       const char *field1, const char *field2,

				       const char *field3, const char *field4)

{

	int val1 = -1;

	int val2 = -2;
@@ -336,8 +337,8 @@ static int ksz9021_load_values_from_of(struct phy_device *phydev, 


static int ksz9021_config_init(struct phy_device *phydev)

{

	struct device *dev = &phydev->dev;

	struct device_node *of_node = dev->of_node;

	const struct device *dev = &phydev->dev;

	const struct device_node *of_node = dev->of_node;



	if (!of_node && dev->parent->of_node)

		of_node = dev->parent->of_node;
@@ -365,6 +366,11 @@ static int ksz9021_config_init(struct phy_device *phydev) 
#define KSZ9031_PS_TO_REG		60



/* Extended registers */

/* MMD Address 0x0 */

#define MII_KSZ9031RN_FLP_BURST_TX_LO	3

#define MII_KSZ9031RN_FLP_BURST_TX_HI	4



/* MMD Address 0x2 */

#define MII_KSZ9031RN_CONTROL_PAD_SKEW	4

#define MII_KSZ9031RN_RX_DATA_PAD_SKEW	5

#define MII_KSZ9031RN_TX_DATA_PAD_SKEW	6
@@ -389,9 +395,9 @@ static int ksz9031_extended_read(struct phy_device *phydev, 
}



static int ksz9031_of_load_skew_values(struct phy_device *phydev,

				       struct device_node *of_node,

				       const struct device_node *of_node,

				       u16 reg, size_t field_sz,

				       char *field[], u8 numfields)

				       const char *field[], u8 numfields)

{

	int val[4] = {-1, -2, -3, -4};

	int matches = 0;
@@ -425,20 +431,36 @@ static int ksz9031_of_load_skew_values(struct phy_device *phydev, 
	return ksz9031_extended_write(phydev, OP_DATA, 2, reg, newval);

}



static int ksz9031_center_flp_timing(struct phy_device *phydev)

{

	int result;



	/* Center KSZ9031RNX FLP timing at 16ms. */

	result = ksz9031_extended_write(phydev, OP_DATA, 0,

					MII_KSZ9031RN_FLP_BURST_TX_HI, 0x0006);

	result = ksz9031_extended_write(phydev, OP_DATA, 0,

					MII_KSZ9031RN_FLP_BURST_TX_LO, 0x1A80);



	if (result)

		return result;



	return genphy_restart_aneg(phydev);

}



static int ksz9031_config_init(struct phy_device *phydev)

{

	struct device *dev = &phydev->dev;

	struct device_node *of_node = dev->of_node;

	char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"};

	char *rx_data_skews[4] = {

	const struct device *dev = &phydev->dev;

	const struct device_node *of_node = dev->of_node;

	static const char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"};

	static const char *rx_data_skews[4] = {

		"rxd0-skew-ps", "rxd1-skew-ps",

		"rxd2-skew-ps", "rxd3-skew-ps"

	};

	char *tx_data_skews[4] = {

	static const char *tx_data_skews[4] = {

		"txd0-skew-ps", "txd1-skew-ps",

		"txd2-skew-ps", "txd3-skew-ps"

	};

	char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};

	static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};



	if (!of_node && dev->parent->of_node)

		of_node = dev->parent->of_node;
@@ -460,7 +482,8 @@ static int ksz9031_config_init(struct phy_device *phydev) 
				MII_KSZ9031RN_TX_DATA_PAD_SKEW, 4,

				tx_data_skews, 4);

	}

	return 0;



	return ksz9031_center_flp_timing(phydev);

}



#define KSZ8873MLL_GLOBAL_CONTROL_4	0x06
@@ -519,7 +542,7 @@ ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum, 
static int kszphy_probe(struct phy_device *phydev)

{

	const struct kszphy_type *type = phydev->drv->driver_data;

	struct device_node *np = phydev->dev.of_node;

	const struct device_node *np = phydev->dev.of_node;

	struct kszphy_priv *priv;

	struct clk *clk;

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE