diff options
| author | Simon Glass <sjg@chromium.org> | 2023-02-22 09:33:51 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-02 17:45:58 -0500 |
| commit | b51b1a8442e590cdfcb6b110803e87cdf4783dfd (patch) | |
| tree | 47c77e9f8da9ba1ceaf70e70e71c21b2e033cd33 | |
| parent | cd3a35ef0bfa564c59c4113f3c3c0631bd04a3a9 (diff) | |
Correct SPL uses of PHY_FIXED
This converts 3 usages of this option to the non-SPL form, since there is
no SPL_PHY_FIXED defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/net/mvneta.c | 4 | ||||
| -rw-r--r-- | net/mdio-uclass.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d4..24933473fa 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -815,7 +815,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp) mvreg_write(pp, MVNETA_SDMA_CONFIG, val); /* Enable PHY polling in hardware if not in fixed-link mode */ - if (!CONFIG_IS_ENABLED(PHY_FIXED) || + if (!IS_ENABLED(CONFIG_PHY_FIXED) || pp->phydev->phy_id != PHY_FIXED_ID) { mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr); @@ -1176,7 +1176,7 @@ static void mvneta_adjust_link(struct udevice *dev) * be added). Also, why is ADVERT_FC enabled if we don't enable * inband AN at all? */ - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && pp->phydev->phy_id == PHY_FIXED_ID) val = MVNETA_GMAC_IB_BYPASS_AN_EN | MVNETA_GMAC_SET_FC_EN | diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index d80037d0ac..e758cc66d7 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -175,7 +175,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev, struct phy_device *phy; ofnode phynode; - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) { phy = phy_connect(NULL, 0, ethdev, interface); goto out; |