brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

common: board_r: Drop initr_bbmii wrapper 

Add a return value to bb_miiphy_init and use it directly in the
post-relocation init sequence, rather than using a wrapper stub.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Ovidiu Panait 2020-11-28 10:43:17 +02:00 committed by Tom Rini
parent ce41e73523
commit c65abc70fb
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/board_r.c
View File

@ -534,14 +534,6 @@ static int initr_scsi(void)
}
#endif
#ifdef CONFIG_BITBANGMII
static int initr_bbmii(void)
{
bb_miiphy_init();
return 0;
}
#endif
#ifdef CONFIG_CMD_NET
static int initr_net(void)
{
@ -783,7 +775,7 @@ static init_fnc_t init_sequence_r[] = {
initr_scsi,
#endif
#ifdef CONFIG_BITBANGMII
initr_bbmii,
bb_miiphy_init,
#endif
#ifdef CONFIG_PCI_ENDPOINT
pci_ep_init,

4
drivers/net/phy/miiphybb.c
View File

@ -105,7 +105,7 @@ int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
sizeof(bb_miiphy_buses[0]);
#endif
void bb_miiphy_init(void)
int bb_miiphy_init(void)
{
int i;
@ -124,6 +124,8 @@ void bb_miiphy_init(void)
bb_miiphy_buses[i].init(&bb_miiphy_buses[i]);
}
}
return 0;
}
static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname)

10
include/miiphy.h
View File

@ -81,7 +81,15 @@ struct bb_miiphy_bus {
extern struct bb_miiphy_bus bb_miiphy_buses[];
extern int bb_miiphy_buses_num;
void bb_miiphy_init(void);
/**
* bb_miiphy_init() - Initialize bit-banged MII bus driver
*
* It is called during the generic post-relocation init sequence.
*
* Return: 0 if OK
*/
int bb_miiphy_init(void);
int bb_miiphy_read(struct mii_dev *miidev, int addr, int devad, int reg);
int bb_miiphy_write(struct mii_dev *miidev, int addr, int devad, int reg,
u16 value);