diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-08 21:24:44 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-08 21:24:44 (GMT) |
| commit | 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a (patch) | |
| tree | 279c781bdcbe697257ff86714fa0355bcd92fd19 /drivers/net/sun8i_emac.c | |
| parent | 7582ddce132390fba10822c5977cd1ab532bb1eb (diff) | |
| parent | f11a0af713a714ee2efcd810dd81c6dfd59381aa (diff) | |
| download | u-boot-fsl-qoriq-21342d4aed6c77a4aa7a5b2579b3c23e21aea31a.tar.xz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/net/sun8i_emac.c')
| -rw-r--r-- | drivers/net/sun8i_emac.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index abd9cc8..b87210b 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -442,7 +442,7 @@ static int parse_phy_pins(struct udevice *dev) const char *pin_name; int drive, pull, i; - offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, + offset = fdtdec_lookup_phandle(gd->fdt_blob, dev_of_offset(dev), "pinctrl-0"); if (offset < 0) { printf("WARNING: emac: cannot find pinctrl-0 node\n"); @@ -716,6 +716,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) struct eth_pdata *pdata = dev_get_platdata(dev); struct emac_eth_dev *priv = dev_get_priv(dev); const char *phy_mode; + int node = dev_of_offset(dev); int offset = 0; pdata->iobase = dev_get_addr_name(dev, "emac"); @@ -725,13 +726,13 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) priv->phyaddr = -1; priv->use_internal_phy = false; - offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, + offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy"); if (offset > 0) priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1); - phy_mode = fdt_getprop(gd->fdt_blob, dev->of_offset, "phy-mode", NULL); + phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL); if (phy_mode) pdata->phy_interface = phy_get_interface_by_name(phy_mode); @@ -751,7 +752,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) } if (priv->variant == H3_EMAC) { - if (fdt_getprop(gd->fdt_blob, dev->of_offset, + if (fdt_getprop(gd->fdt_blob, node, "allwinner,use-internal-phy", NULL)) priv->use_internal_phy = true; } |