projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
mpc8568_serdes.c
diff --git
a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
index 9199f01b9bb2904b6daae770391f38f6d640bc33..7c287a0ddd0aedecc6ff9111cc9b2ebf2ffad397 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
+++ b/
arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c
@@
-24,6
+24,9
@@
static u8 serdes1_cfg_tbl[][SRDS1_MAX_LANES] = {
int is_serdes_configured(enum srds_prtcl prtcl)
{
int is_serdes_configured(enum srds_prtcl prtcl)
{
+ if (!(serdes1_prtcl_map & (1 << NONE)))
+ fsl_serdes_init();
+
return (1 << prtcl) & serdes1_prtcl_map;
}
return (1 << prtcl) & serdes1_prtcl_map;
}
@@
-35,6
+38,9
@@
void fsl_serdes_init(void)
MPC85xx_PORDEVSR_IO_SEL_SHIFT;
int lane;
MPC85xx_PORDEVSR_IO_SEL_SHIFT;
int lane;
+ if (serdes1_prtcl_map & (1 << NONE))
+ return;
+
debug("PORDEVSR[IO_SEL_SRDS] = %x\n", srds_cfg);
if (srds_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
debug("PORDEVSR[IO_SEL_SRDS] = %x\n", srds_cfg);
if (srds_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
@@
-46,4
+52,7
@@
void fsl_serdes_init(void)
enum srds_prtcl lane_prtcl = serdes1_cfg_tbl[srds_cfg][lane];
serdes1_prtcl_map |= (1 << lane_prtcl);
}
enum srds_prtcl lane_prtcl = serdes1_cfg_tbl[srds_cfg][lane];
serdes1_prtcl_map |= (1 << lane_prtcl);
}
+
+ /* Set the first bit to indicate serdes has been initialized */
+ serdes1_prtcl_map |= (1 << NONE);
}
}