]> git.baikalelectronics.ru Git - uboot.git/commitdiff
Correct SPL uses of PHY_FIXED
authorSimon Glass <sjg@chromium.org>
Wed, 22 Feb 2023 16:33:51 +0000 (09:33 -0700)
committerTom Rini <trini@konsulko.com>
Thu, 2 Mar 2023 22:45:58 +0000 (17:45 -0500)
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>
drivers/net/mvneta.c
net/mdio-uclass.c

index 0fbfad11d4580f3f48533ee4e7505e7ffc8ee795..24933473fa059e9279f8189bfb212c43bf7e7e75 100644 (file)
@@ -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 |
index d80037d0ac71d5f6334acdb365f3cdad9f034ace..e758cc66d7e01c8265f6a325a30df54555fa1dd6 100644 (file)
@@ -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;