diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-11 14:21:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-11 14:21:50 -0400 |
| commit | d43ef73bf26614af9b01fd57baa1a1fcf24bfade (patch) | |
| tree | e37eac34d78100d69ac984525f98186d1e68d0b7 /drivers/net/gmac_rockchip.c | |
| parent | 6b26aaef083957b75bcd69aa65bd6ffcf9245bb3 (diff) | |
| parent | 2454b719fb874120e06e4aa64bfb9450d091e56c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'drivers/net/gmac_rockchip.c')
| -rw-r--r-- | drivers/net/gmac_rockchip.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 5e2ca763027..c9f9e839bad 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -43,18 +43,16 @@ struct rk_gmac_ops { static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev) { struct gmac_rockchip_platdata *pdata = dev_get_platdata(dev); - const void *blob = gd->fdt_blob; - int node = dev_of_offset(dev); /* Check the new naming-style first... */ - pdata->tx_delay = fdtdec_get_int(blob, node, "tx_delay", -ENOENT); - pdata->rx_delay = fdtdec_get_int(blob, node, "rx_delay", -ENOENT); + pdata->tx_delay = dev_read_u32_default(dev, "tx_delay", -ENOENT); + pdata->rx_delay = dev_read_u32_default(dev, "rx_delay", -ENOENT); /* ... and fall back to the old naming style or default, if necessary */ if (pdata->tx_delay == -ENOENT) - pdata->tx_delay = fdtdec_get_int(blob, node, "tx-delay", 0x30); + pdata->tx_delay = dev_read_u32_default(dev, "tx-delay", 0x30); if (pdata->rx_delay == -ENOENT) - pdata->rx_delay = fdtdec_get_int(blob, node, "rx-delay", 0x10); + pdata->rx_delay = dev_read_u32_default(dev, "rx-delay", 0x10); return designware_eth_ofdata_to_platdata(dev); } |