Merge git://git.denx.de/u-boot-fsl-qoriq
trini: Drop local memset() from examples/standalone/mem_to_mem_idma2intr.c Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -28,9 +28,15 @@ int is_serdes_configured(enum srds_prtcl device)
|
||||
int ret = 0;
|
||||
|
||||
#ifdef CONFIG_SYS_FSL_SRDS_1
|
||||
if (!serdes1_prtcl_map[NONE])
|
||||
fsl_serdes_init();
|
||||
|
||||
ret |= serdes1_prtcl_map[device];
|
||||
#endif
|
||||
#ifdef CONFIG_SYS_FSL_SRDS_2
|
||||
if (!serdes2_prtcl_map[NONE])
|
||||
fsl_serdes_init();
|
||||
|
||||
ret |= serdes2_prtcl_map[device];
|
||||
#endif
|
||||
|
||||
@@ -79,6 +85,9 @@ void serdes_init(u32 sd, u32 sd_addr, u32 sd_prctl_mask, u32 sd_prctl_shift,
|
||||
u32 cfg;
|
||||
int lane;
|
||||
|
||||
if (serdes_prtcl_map[NONE])
|
||||
return;
|
||||
|
||||
memset(serdes_prtcl_map, 0, sizeof(u8) * SERDES_PRCTL_COUNT);
|
||||
|
||||
cfg = gur_in32(&gur->rcwsr[28]) & sd_prctl_mask;
|
||||
@@ -136,6 +145,9 @@ void serdes_init(u32 sd, u32 sd_addr, u32 sd_prctl_mask, u32 sd_prctl_shift,
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/* Set the first element to indicate serdes has been initialized */
|
||||
serdes_prtcl_map[NONE] = 1;
|
||||
}
|
||||
|
||||
void fsl_serdes_init(void)
|
||||
|
||||
Reference in New Issue
Block a user