From cb5761f774dffeff7cf19d40803613db7089c9af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Fri, 14 Jul 2017 08:53:57 +0200 Subject: [PATCH] net: fec_mxc: adjust prototype of fec_get_miibus() for DM_ETH MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- drivers/net/fec_mxc.c | 9 +++++++++ include/netdev.h | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 40be520..dc7b512 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 c06b908..b9bfeba 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, -- 2.7.4