LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: fec_mxc: adjust prototype of fec_get_miibus() for DM_ETH 

commit 306dd7dabd ("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>
This commit is contained in:
Lothar Waßmann 2017-07-14 08:53:57 +02:00 committed by Stefano Babic
parent f19955a014
commit cb5761f774
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/fec_mxc.c
View File

@ -985,9 +985,18 @@ static void fec_free_descs(struct fec_priv *fec)
free(fec->tbd_base); 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) 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; struct ethernet_regs *eth = (struct ethernet_regs *)base_addr;
#endif
struct mii_dev *bus; struct mii_dev *bus;
int ret; int ret;

5
include/netdev.h
View File

@ -130,7 +130,12 @@ static inline int pci_eth_init(bd_t *bis)
return num; 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); struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id);
#endif
#ifdef CONFIG_PHYLIB #ifdef CONFIG_PHYLIB
struct phy_device; struct phy_device;
int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr, int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,