net: phy: at803x: Disable phy delay for RGMII mode

vinodkoul · davem330 · commit cd28d1d6e52e · 2019-01-22T19:37:59.000-08:00
For RGMII mode, phy delay should be disabled. Add this case along
with disable delay routines.

Signed-off-by: Vinod Koul &lt;vkoul@kernel.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
@@ -110,16 +110,16 @@ static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
 	return phy_write(phydev, AT803X_DEBUG_DATA, val);
 }
 
-static inline int at803x_enable_rx_delay(struct phy_device *phydev)
+static inline int at803x_disable_rx_delay(struct phy_device *phydev)
 {
-	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,
-					AT803X_DEBUG_RX_CLK_DLY_EN);
+	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
+				     AT803X_DEBUG_RX_CLK_DLY_EN, 0);
 }
 
-static inline int at803x_enable_tx_delay(struct phy_device *phydev)
+static inline int at803x_disable_tx_delay(struct phy_device *phydev)
 {
-	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-					AT803X_DEBUG_TX_CLK_DLY_EN);
+	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
+				     AT803X_DEBUG_TX_CLK_DLY_EN, 0);
 }
 
 /* save relevant PHY registers to private copy */
@@ -256,15 +256,17 @@ static int at803x_config_init(struct phy_device *phydev)
 		return ret;
 
 	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID ||
-			phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
-		ret = at803x_enable_rx_delay(phydev);
+			phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+			phydev->interface == PHY_INTERFACE_MODE_RGMII) {
+		ret = at803x_disable_rx_delay(phydev);
 		if (ret < 0)
 			return ret;
 	}
 
 	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID ||
-			phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
-		ret = at803x_enable_tx_delay(phydev);
+			phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+			phydev->interface == PHY_INTERFACE_MODE_RGMII) {
+		ret = at803x_disable_tx_delay(phydev);
 		if (ret < 0)
 			return ret;
 	}

Original file line number	Diff line number	Diff line change
`@@ -110,16 +110,16 @@ static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,`
`110`	`110`	`return phy_write(phydev, AT803X_DEBUG_DATA, val);`
`111`	`111`	`}`
`112`	`112`
`113`		`-static inline int at803x_enable_rx_delay(struct phy_device *phydev)`
	`113`	`+static inline int at803x_disable_rx_delay(struct phy_device *phydev)`
`114`	`114`	`{`
`115`		`- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,`
`116`		`- AT803X_DEBUG_RX_CLK_DLY_EN);`
	`115`	`+ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,`
	`116`	`+ AT803X_DEBUG_RX_CLK_DLY_EN, 0);`
`117`	`117`	`}`
`118`	`118`
`119`		`-static inline int at803x_enable_tx_delay(struct phy_device *phydev)`
	`119`	`+static inline int at803x_disable_tx_delay(struct phy_device *phydev)`
`120`	`120`	`{`
`121`		`- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,`
`122`		`- AT803X_DEBUG_TX_CLK_DLY_EN);`
	`121`	`+ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,`
	`122`	`+ AT803X_DEBUG_TX_CLK_DLY_EN, 0);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/* save relevant PHY registers to private copy */`
`@@ -256,15 +256,17 @@ static int at803x_config_init(struct phy_device *phydev)`
`256`	`256`	`return ret;`
`257`	`257`
`258`	`258`	`if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID \|\|`
`259`		`- phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {`
`260`		`- ret = at803x_enable_rx_delay(phydev);`
	`259`	`+ phydev->interface == PHY_INTERFACE_MODE_RGMII_ID \|\|`
	`260`	`+ phydev->interface == PHY_INTERFACE_MODE_RGMII) {`
	`261`	`+ ret = at803x_disable_rx_delay(phydev);`
`261`	`262`	`if (ret < 0)`
`262`	`263`	`return ret;`
`263`	`264`	`}`
`264`	`265`
`265`	`266`	`if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID \|\|`
`266`		`- phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {`
`267`		`- ret = at803x_enable_tx_delay(phydev);`
	`267`	`+ phydev->interface == PHY_INTERFACE_MODE_RGMII_ID \|\|`
	`268`	`+ phydev->interface == PHY_INTERFACE_MODE_RGMII) {`
	`269`	`+ ret = at803x_disable_tx_delay(phydev);`
`268`	`270`	`if (ret < 0)`
`269`	`271`	`return ret;`
`270`	`272`	`}`