stmmac: intel: prepare to support 1000BASE-X phy interface setting

Currently, intel_speed_mode_2500() redundantly fix-up phy_interface to
PHY_INTERFACE_MODE_SGMII if the underlying controller is in 1000Mbps
SGMII mode. The value of phy_interface has been initialized earlier.

This patch removes such redundancy to prepare for setting 1000BASE-X
mode for certain hardware platform configuration.

Also update the intel_mgbe_common_data() to include 1000BASE-X setup.

Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index 38fe77d1035e306c6d3fd13c3fb547d8bfd2cbec..675dfb89b765f7f064134405bf648614394cf18e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -251,7 +251,6 @@ static void intel_speed_mode_2500(struct net_device *ndev, void *intel_data)
                priv->plat->mdio_bus_data->xpcs_an_inband = false;
        } else {
                priv->plat->max_speed = 1000;
-               priv->plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
                priv->plat->mdio_bus_data->xpcs_an_inband = true;
        }
 }
@@ -562,7 +561,8 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
        plat->vlan_fail_q = plat->rx_queues_to_use - 1;
 
        /* Intel mgbe SGMII interface uses pcs-xcps */
-       if (plat->phy_interface == PHY_INTERFACE_MODE_SGMII) {
+       if (plat->phy_interface == PHY_INTERFACE_MODE_SGMII ||
+           plat->phy_interface == PHY_INTERFACE_MODE_1000BASEX) {
                plat->mdio_bus_data->has_xpcs = true;
                plat->mdio_bus_data->xpcs_an_inband = true;
        }