Skip to content

Commit

Permalink
net: stmmac: update pci platform data to use phy_interface
Browse files Browse the repository at this point in the history
The recent patch to support passive mode converter did not take care the
phy interface configuration in PCI platform data. Hence, converting all
the PCI platform data from plat->interface to plat->phy_interface as the
default mode is meant for PHY.

Fixes: 0060c87 ("net: stmmac: implement support for passive mode converters via dt")
Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Tested-by: Tan, Tee Min <tee.min.tan@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Voon Weifeng authored and David S. Miller committed Feb 7, 2020
1 parent 2f633d5 commit 909c1dd
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static int stmmac_default_data(struct pci_dev *pdev,

plat->bus_id = 1;
plat->phy_addr = 0;
plat->interface = PHY_INTERFACE_MODE_GMII;
plat->phy_interface = PHY_INTERFACE_MODE_GMII;

plat->dma_cfg->pbl = 32;
plat->dma_cfg->pblx8 = true;
Expand Down Expand Up @@ -217,7 +217,8 @@ static int ehl_sgmii_data(struct pci_dev *pdev,
{
plat->bus_id = 1;
plat->phy_addr = 0;
plat->interface = PHY_INTERFACE_MODE_SGMII;
plat->phy_interface = PHY_INTERFACE_MODE_SGMII;

return ehl_common_data(pdev, plat);
}

Expand All @@ -230,7 +231,8 @@ static int ehl_rgmii_data(struct pci_dev *pdev,
{
plat->bus_id = 1;
plat->phy_addr = 0;
plat->interface = PHY_INTERFACE_MODE_RGMII;
plat->phy_interface = PHY_INTERFACE_MODE_RGMII;

return ehl_common_data(pdev, plat);
}

Expand Down Expand Up @@ -258,7 +260,7 @@ static int tgl_sgmii_data(struct pci_dev *pdev,
{
plat->bus_id = 1;
plat->phy_addr = 0;
plat->interface = PHY_INTERFACE_MODE_SGMII;
plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
return tgl_common_data(pdev, plat);
}

Expand Down Expand Up @@ -358,7 +360,7 @@ static int quark_default_data(struct pci_dev *pdev,

plat->bus_id = pci_dev_id(pdev);
plat->phy_addr = ret;
plat->interface = PHY_INTERFACE_MODE_RMII;
plat->phy_interface = PHY_INTERFACE_MODE_RMII;

plat->dma_cfg->pbl = 16;
plat->dma_cfg->pblx8 = true;
Expand Down Expand Up @@ -415,7 +417,7 @@ static int snps_gmac5_default_data(struct pci_dev *pdev,

plat->bus_id = 1;
plat->phy_addr = -1;
plat->interface = PHY_INTERFACE_MODE_GMII;
plat->phy_interface = PHY_INTERFACE_MODE_GMII;

plat->dma_cfg->pbl = 32;
plat->dma_cfg->pblx8 = true;
Expand Down

0 comments on commit 909c1dd

Please sign in to comment.