diff options
| author | Lothar Waßmann <LW@KARO-electronics.de> | 2017-07-14 09:53:57 +0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-07-28 14:41:49 +0300 |
| commit | cb5761f774dffeff7cf19d40803613db7089c9af (patch) | |
| tree | c4fe27b8972faab3bd5e33a5a24ae105c510c454 | |
| parent | f19955a01482d118eac0fdaf530ec6e5b08cf414 (diff) | |
| download | u-boot-cb5761f774dffeff7cf19d40803613db7089c9af.tar.xz | |
net: fec_mxc: adjust prototype of fec_get_miibus() for DM_ETH
commit 306dd7dabd64 ("net: fec_mxc: fix PHY initialization bug with CONFIG_DM_ETH")
has broken the build of the fec_mxc driver with CONFIG_DM_ETH
enabled because it changed the parameters passed to *fec_get_miibus()
without changing the functions prototype.
This patch fixes up the prototype of fec_get_miibus() for the DM_ETH case.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
| -rw-r--r-- | drivers/net/fec_mxc.c | 9 | ||||
| -rw-r--r-- | include/netdev.h | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 40be52070e..dc7b5127eb 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; diff --git a/include/netdev.h b/include/netdev.h index c06b90886b..b9bfebac67 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -130,7 +130,12 @@ static inline int pci_eth_init(bd_t *bis) return num; } +#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_PHYLIB struct phy_device; int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr, |