Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct SPL uses of PHY_FIXED

Browse source 
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>
This commit is contained in:
Simon Glass 2023-02-22 09:33:51 -07:00 committed by Tom Rini
parent cd3a35ef0b
commit b51b1a8442
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/mvneta.c
View file

@ -815,7 +815,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp)
mvreg_write(pp, MVNETA_SDMA_CONFIG, val); mvreg_write(pp, MVNETA_SDMA_CONFIG, val);
/* Enable PHY polling in hardware if not in fixed-link mode */ /* 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) { pp->phydev->phy_id != PHY_FIXED_ID) {
mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr); 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 * be added). Also, why is ADVERT_FC enabled if we don't enable
* inband AN at all? * inband AN at all?
*/ */
if (CONFIG_IS_ENABLED(PHY_FIXED) && if (IS_ENABLED(CONFIG_PHY_FIXED) &&
pp->phydev->phy_id == PHY_FIXED_ID) pp->phydev->phy_id == PHY_FIXED_ID)
val = MVNETA_GMAC_IB_BYPASS_AN_EN | val = MVNETA_GMAC_IB_BYPASS_AN_EN |
MVNETA_GMAC_SET_FC_EN | MVNETA_GMAC_SET_FC_EN |

2
net/mdio-uclass.c
View file

@ -175,7 +175,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev,
struct phy_device *phy; struct phy_device *phy;
ofnode phynode; ofnode phynode;
if (CONFIG_IS_ENABLED(PHY_FIXED) && if (IS_ENABLED(CONFIG_PHY_FIXED) &&
ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) { ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) {
phy = phy_connect(NULL, 0, ethdev, interface); phy = phy_connect(NULL, 0, ethdev, interface);
goto out; goto out;