Commit ab77c7aa authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: stmmac: dwmac-intel: remove checking for fixed link

With the new default_an_inband functionality in phylink, there is no
need to check for a fixed link when this flag is set, since a fixed
link will now override default_an_inband.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/E1sCJNB-00EcrJ-7L@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 83f55b01
...@@ -589,17 +589,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, ...@@ -589,17 +589,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
plat->mdio_bus_data->default_an_inband = true; plat->mdio_bus_data->default_an_inband = true;
} }
/* For fixed-link setup, we clear default_an_inband */
if (fwnode) {
struct fwnode_handle *fixed_node;
fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link");
if (fixed_node)
plat->mdio_bus_data->default_an_inband = false;
fwnode_handle_put(fixed_node);
}
/* Ensure mdio bus scan skips intel serdes and pcs-xpcs */ /* Ensure mdio bus scan skips intel serdes and pcs-xpcs */
plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR; plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR;
plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR; plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR;
......
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