Commit bff6f1db authored by Voon Weifeng's avatar Voon Weifeng Committed by Jakub Kicinski

stmmac: intel: change all EHL/TGL to auto detect phy addr

Set all EHL/TGL phy_addr to -1 so that the driver will automatically
detect it at run-time by probing all the possible 32 addresses.
Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
Signed-off-by: default avatarWong Vee Khee <vee.khee.wong@intel.com>
Link: https://lore.kernel.org/r/20201106094341.4241-1-vee.khee.wong@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ef9ac209
...@@ -236,6 +236,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, ...@@ -236,6 +236,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
int ret; int ret;
int i; int i;
plat->phy_addr = -1;
plat->clk_csr = 5; plat->clk_csr = 5;
plat->has_gmac = 0; plat->has_gmac = 0;
plat->has_gmac4 = 1; plat->has_gmac4 = 1;
...@@ -345,7 +346,6 @@ static int ehl_sgmii_data(struct pci_dev *pdev, ...@@ -345,7 +346,6 @@ static int ehl_sgmii_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat) struct plat_stmmacenet_data *plat)
{ {
plat->bus_id = 1; plat->bus_id = 1;
plat->phy_addr = 0;
plat->phy_interface = PHY_INTERFACE_MODE_SGMII; plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
plat->serdes_powerup = intel_serdes_powerup; plat->serdes_powerup = intel_serdes_powerup;
...@@ -362,7 +362,6 @@ static int ehl_rgmii_data(struct pci_dev *pdev, ...@@ -362,7 +362,6 @@ static int ehl_rgmii_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat) struct plat_stmmacenet_data *plat)
{ {
plat->bus_id = 1; plat->bus_id = 1;
plat->phy_addr = 0;
plat->phy_interface = PHY_INTERFACE_MODE_RGMII; plat->phy_interface = PHY_INTERFACE_MODE_RGMII;
return ehl_common_data(pdev, plat); return ehl_common_data(pdev, plat);
...@@ -376,7 +375,6 @@ static int ehl_pse0_common_data(struct pci_dev *pdev, ...@@ -376,7 +375,6 @@ static int ehl_pse0_common_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat) struct plat_stmmacenet_data *plat)
{ {
plat->bus_id = 2; plat->bus_id = 2;
plat->phy_addr = 1;
return ehl_common_data(pdev, plat); return ehl_common_data(pdev, plat);
} }
...@@ -408,7 +406,6 @@ static int ehl_pse1_common_data(struct pci_dev *pdev, ...@@ -408,7 +406,6 @@ static int ehl_pse1_common_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat) struct plat_stmmacenet_data *plat)
{ {
plat->bus_id = 3; plat->bus_id = 3;
plat->phy_addr = 1;
return ehl_common_data(pdev, plat); return ehl_common_data(pdev, plat);
} }
...@@ -450,7 +447,6 @@ static int tgl_sgmii_data(struct pci_dev *pdev, ...@@ -450,7 +447,6 @@ static int tgl_sgmii_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat) struct plat_stmmacenet_data *plat)
{ {
plat->bus_id = 1; plat->bus_id = 1;
plat->phy_addr = 0;
plat->phy_interface = PHY_INTERFACE_MODE_SGMII; plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
plat->serdes_powerup = intel_serdes_powerup; plat->serdes_powerup = intel_serdes_powerup;
plat->serdes_powerdown = intel_serdes_powerdown; plat->serdes_powerdown = intel_serdes_powerdown;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment