diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
| commit | 39632b4a01210e329333d787d828157dcd2c7328 (patch) | |
| tree | a1013e4161de425f81aea052eeabe572c5e557d3 /drivers/net | |
| parent | e14b1169c0c5a1b362b41451006b492bd16f2fff (diff) | |
| parent | 651782a08b5bb4e710bda1b11fff774b8ade384f (diff) | |
| download | u-boot-fsl-qoriq-39632b4a01210e329333d787d828157dcd2c7328.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mxc.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 6840908..40be520 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -23,7 +23,7 @@ #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> -#include <asm/imx-common/sys_proto.h> +#include <asm/mach-imx/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; @@ -1223,17 +1223,6 @@ static int fecmxc_probe(struct udevice *dev) if (ret) return ret; - bus = fec_get_miibus((uint32_t)priv->eth, dev_id); - if (!bus) - goto err_mii; - - priv->bus = bus; - priv->xcv_type = CONFIG_FEC_XCV_TYPE; - priv->interface = pdata->phy_interface; - ret = fec_phy_init(priv, dev); - if (ret) - goto err_phy; - /* Reset chip. */ writel(readl(&priv->eth->ecntrl) | FEC_ECNTRL_RESET, &priv->eth->ecntrl); @@ -1249,6 +1238,19 @@ static int fecmxc_probe(struct udevice *dev) fec_reg_setup(priv); priv->dev_id = (dev_id == -1) ? 0 : dev_id; + bus = fec_get_miibus(dev, dev_id); + if (!bus) { + ret = -ENOMEM; + goto err_mii; + } + + priv->bus = bus; + priv->xcv_type = CONFIG_FEC_XCV_TYPE; + priv->interface = pdata->phy_interface; + ret = fec_phy_init(priv, dev); + if (ret) + goto err_phy; + return 0; err_timeout: |