diff options
| author | Marek Behún <marek.behun@nic.cz> | 2022-04-27 12:42:01 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2022-05-04 07:05:51 +0200 |
| commit | bdbda1e82667addb256ef7ee11718615e350c697 (patch) | |
| tree | 9c1856404693511bc09ce3605b6aae9cf1b3ad40 | |
| parent | 38332211e3007ec18b66d9bcd4d56338953d88ab (diff) | |
| download | u-boot-bdbda1e82667addb256ef7ee11718615e350c697.zip u-boot-bdbda1e82667addb256ef7ee11718615e350c697.tar.gz u-boot-bdbda1e82667addb256ef7ee11718615e350c697.tar.bz2 | |
net: mvneta: Disable fixed PHY code if PHY_FIXED is not compiled in
Guard the code handling the fixed PHY case by
CONFIG_IS_ENABLED(PHY_FIXED).
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | drivers/net/mvneta.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 378789b..292c364 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -812,7 +812,8 @@ 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 (pp->phydev->phy_id != PHY_FIXED_ID) { + if (!CONFIG_IS_ENABLED(PHY_FIXED) || + pp->phydev->phy_id != PHY_FIXED_ID) { mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr); val = mvreg_read(pp, MVNETA_UNIT_CONTROL); @@ -1172,7 +1173,8 @@ 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 (pp->phydev->phy_id == PHY_FIXED_ID) + if (CONFIG_IS_ENABLED(PHY_FIXED) && + pp->phydev->phy_id == PHY_FIXED_ID) val = MVNETA_GMAC_FORCE_LINK_UP | MVNETA_GMAC_IB_BYPASS_AN_EN | MVNETA_GMAC_SET_FC_EN | |