Pass the current phylink phy interface mode to the RGMII and "SGMII" configuration functions. Signed-off-by: Russell King (Oracle) --- .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 9b29516a5a7c..e2dd334ffd31 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -100,7 +100,8 @@ struct ethqos_emac_driver_data { struct qcom_ethqos { struct platform_device *pdev; void __iomem *rgmii_base; - void (*configure_func)(struct qcom_ethqos *ethqos, int speed); + void (*configure_func)(struct qcom_ethqos *ethqos, + phy_interface_t interface, int speed); unsigned int link_clk_rate; struct clk *link_clk; @@ -521,7 +522,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed) return 0; } -static void ethqos_configure_rgmii(struct qcom_ethqos *ethqos, int speed) +static void ethqos_configure_rgmii(struct qcom_ethqos *ethqos, + phy_interface_t interface, int speed) { struct device *dev = ðqos->pdev->dev; unsigned int i; @@ -605,7 +607,8 @@ static void ethqos_pcs_set_inband(struct stmmac_priv *priv, bool enable) /* On interface toggle MAC registers gets reset. * Configure MAC block for SGMII on ethernet phy link up */ -static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos, int speed) +static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos, + phy_interface_t interface, int speed) { struct net_device *dev = platform_get_drvdata(ethqos->pdev); struct stmmac_priv *priv = netdev_priv(dev); @@ -638,9 +641,10 @@ static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos, int speed) } } -static void ethqos_configure(struct qcom_ethqos *ethqos, int speed) +static void ethqos_configure(struct qcom_ethqos *ethqos, + phy_interface_t interface, int speed) { - return ethqos->configure_func(ethqos, speed); + return ethqos->configure_func(ethqos, interface, speed); } static void ethqos_fix_mac_speed(void *priv, phy_interface_t interface, @@ -649,7 +653,7 @@ static void ethqos_fix_mac_speed(void *priv, phy_interface_t interface, struct qcom_ethqos *ethqos = priv; ethqos_update_link_clk(ethqos, speed); - ethqos_configure(ethqos, speed); + ethqos_configure(ethqos, interface, speed); } static int qcom_ethqos_serdes_powerup(struct net_device *ndev, void *priv) -- 2.47.3