Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / drivers / net / phy / micrel_ksz90x1.c

diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 20f8a551963cee8c4efc2c7c46fa97e244f6ec06..b350a61aa64bb06bc30e175765d94f75adcdd06c 100644 (file)
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -9,11 +9,11 @@
  * (C) Copyright 2017 Adaptrum, Inc.
  * Written by Alexandru Gagniuc <alex.g@adaptrum.com> for Adaptrum, Inc.
  */
+
 #include <config.h>
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <fdtdec.h>
 #include <micrel.h>
 #include <phy.h>
 
@@ -120,8 +120,7 @@ static int ksz90x1_of_config_group(struct phy_device *phydev,
                return -EOPNOTSUPP;
 
        for (i = 0; i < ofcfg->grpsz; i++) {
-               val[i] = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev),
-                                        ofcfg->grp[i].name, -1);
+               val[i] = dev_read_u32_default(dev, ofcfg->grp[i].name, ~0);
                offset = ofcfg->grp[i].off;
                if (val[i] == -1) {
                        /* Default register value for KSZ9021 */
@@ -258,7 +257,7 @@ static int ksz9021_config(struct phy_device *phydev)
        if (ret)
                return ret;
 
-       if (getenv("disable_giga"))
+       if (env_get("disable_giga"))
                features &= ~(SUPPORTED_1000baseT_Half |
                SUPPORTED_1000baseT_Full);
        /* force master mode for 1000BaseT due to chip errata */
@@ -344,7 +343,7 @@ static int ksz9031_config(struct phy_device *phydev)
                return ret;
 
        /* add an option to disable the gigabit feature of this PHY */
-       if (getenv("disable_giga")) {
+       if (env_get("disable_giga")) {
                unsigned features;
                unsigned bmcr;