summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2012-07-06 17:10:33 -0500
committerAndy Fleming <afleming@freescale.com>2012-07-06 17:30:33 -0500
commit48f6a5c348453fc3ab33aaa91e5e4198a28678ff (patch)
treef1adc995cec4ced7d867de36230f1aa600c4d216 /arch/powerpc/cpu/mpc85xx/p2041_serdes.c
parent1e9ea85f7dffe949ca5e4845e6336810c144e06d (diff)
downloadtalos-obmc-uboot-48f6a5c348453fc3ab33aaa91e5e4198a28678ff.tar.gz
talos-obmc-uboot-48f6a5c348453fc3ab33aaa91e5e4198a28678ff.zip
powerpc/mpc85xx: Ignore E bit for SVR_SOC_VER()
We don't care E bit of SVR in most cases. Clear E bit for SVR_SOC_VER(). This will simplify the coding. Use IS_E_PROCESSOR() to identify SoC with encryption. Remove all _E entries from SVR list and CPU list. Signed-off-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/p2041_serdes.c')
-rw-r--r--arch/powerpc/cpu/mpc85xx/p2041_serdes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
index f68f28191f..eec4ffe516 100644
--- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c
@@ -78,7 +78,7 @@ enum srds_prtcl serdes_get_prtcl(int cfg, int lane)
prtcl = serdes_cfg_tbl[cfg][lane];
/* P2040[e] does not support XAUI */
- if (((ver == SVR_P2040) || (ver == SVR_P2040_E)) && (prtcl == XAUI_FM1))
+ if (ver == SVR_P2040 && prtcl == XAUI_FM1)
prtcl = NONE;
return prtcl;
@@ -94,7 +94,7 @@ int is_serdes_prtcl_valid(u32 prtcl)
return 0;
/* P2040[e] does not support XAUI */
- if (((ver == SVR_P2040) || (ver == SVR_P2040_E)) && (prtcl == XAUI_FM1))
+ if (ver == SVR_P2040 && prtcl == XAUI_FM1)
return 0;
for (i = 0; i < SRDS_MAX_LANES; i++) {
OpenPOWER on IntegriCloud