[net-next PATCH v2 03/10] net: netcp: ethss: make call to gbe_sgmii_config() conditional
From: andrew@lunn.ch (Andrew Lunn)
Date: 2018-03-27 17:18:30
Also in:
linux-devicetree, lkml, netdev
On Tue, Mar 27, 2018 at 12:31:42PM -0400, Murali Karicheri wrote:
quoted hunk ↗ jump to hunk
As a preparatory patch to add support for 2u cpsw hardware found on K2G SoC, make call to gbe_sgmii_config() conditional. This is required since 2u uses RGMII interface instead of SGMII and to allow for driver re-use. Signed-off-by: Murali Karicheri <redacted> --- drivers/net/ethernet/ti/netcp_ethss.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index 56dbc0b..1dea891 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c@@ -2271,7 +2271,8 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf) void (*hndlr)(struct net_device *) = gbe_adjust_link; - gbe_sgmii_config(priv, slave); + if ((priv->ss_version == GBE_SS_VERSION_14) || IS_SS_ID_NU(priv)) + gbe_sgmii_config(priv, slave);
Or maybe: if (slave->phy_node == PHY_INTERFACE_MODE_SGMII) gbe_sgmii_config(priv, slave); Andrew