Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

common: board_r: Drop initr_pci_ep wrapper

Browse source 
Add a return value to pci_ep_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:11 +02:00 committed by Tom Rini
parent 7addd3c6df
commit c343e8c0bf
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/board_r.c
View file

@ -214,15 +214,6 @@ static int initr_unlock_ram_in_cache(void)
} }
#endif #endif
#ifdef CONFIG_PCI_ENDPOINT
static int initr_pci_ep(void)
{
pci_ep_init();
return 0;
}
#endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int initr_pci(void) static int initr_pci(void)
{ {
@ -836,7 +827,7 @@ static init_fnc_t init_sequence_r[] = {
initr_bbmii, initr_bbmii,
#endif #endif
#ifdef CONFIG_PCI_ENDPOINT #ifdef CONFIG_PCI_ENDPOINT
initr_pci_ep, pci_ep_init,
#endif #endif
#ifdef CONFIG_CMD_NET #ifdef CONFIG_CMD_NET
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET

4
drivers/pci_endpoint/pci_ep-uclass.c
View file

@ -210,7 +210,7 @@ UCLASS_DRIVER(pci_ep) = {
.flags = DM_UC_FLAG_SEQ_ALIAS, .flags = DM_UC_FLAG_SEQ_ALIAS,
}; };
void pci_ep_init(void) int pci_ep_init(void)
{ {
struct udevice *dev; struct udevice *dev;
@ -219,4 +219,6 @@ void pci_ep_init(void)
uclass_next_device_check(&dev)) { uclass_next_device_check(&dev)) {
; ;
} }
return 0;
} }

10
include/init.h
View file

@ -177,6 +177,15 @@ int setup_bdinfo(void);
*/ */
int cpu_secondary_init_r(void); int cpu_secondary_init_r(void);
/**
* pci_ep_init() - Initialize pci endpoint devices
*
* It is called during the generic post-relocation init sequence.
*
* Return: 0 if OK
*/
int pci_ep_init(void);
/** /**
* init_cache_f_r() - Turn on the cache in preparation for relocation * init_cache_f_r() - Turn on the cache in preparation for relocation
* *
@ -249,7 +258,6 @@ int set_cpu_clk_info(void);
int update_flash_size(int flash_size); int update_flash_size(int flash_size);
int arch_early_init_r(void); int arch_early_init_r(void);
void pci_init(void); void pci_init(void);
void pci_ep_init(void);
int misc_init_r(void); int misc_init_r(void);
#if defined(CONFIG_VID) #if defined(CONFIG_VID)
int init_func_vid(void); int init_func_vid(void);