summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-08-16 22:07:20 (GMT)
committerTom Rini <trini@konsulko.com>2017-08-16 22:12:00 (GMT)
commit470135be276b2d92c6da464c68839202d4ff0d08 (patch)
tree4d9370edd492c43f4409ee8716b8fe9264366516 /drivers
parent390194d43fa4478ddb638164ddb114c979f3e57a (diff)
parente872f27a020f353dd334fc025999466adf5ae18c (diff)
downloadu-boot-470135be276b2d92c6da464c68839202d4ff0d08.tar.xz
Merge git://www.denx.de/git/u-boot-imx
Update pfla02 for setenv changes and PHYLIB/etc migration to Kconfig. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fec_mxc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 797e34f..f16b299 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -985,9 +985,18 @@ static void fec_free_descs(struct fec_priv *fec)
free(fec->tbd_base);
}
+#ifdef CONFIG_DM_ETH
+struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id)
+#else
struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id)
+#endif
{
+#ifdef CONFIG_DM_ETH
+ struct fec_priv *priv = dev_get_priv(dev);
+ struct ethernet_regs *eth = priv->eth;
+#else
struct ethernet_regs *eth = (struct ethernet_regs *)base_addr;
+#endif
struct mii_dev *bus;
int ret;