GCC4.6: Squash warnings in denali_spd_ddr2.c

[u-boot] / arch / powerpc / cpu / mpc85xx / p1021_serdes.c

diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
index 457ab5dca87570e2f1a15ca423301436403da9ed..1849c1642cf284d94187f8fe8021a67ba1e59058 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Freescale Semiconductor, Inc.
+ * Copyright 2010-2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -26,6 +26,24 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 
+typedef struct serdes_85xx {
+       u32     srdscr0;        /* 0x00 - SRDS Control Register 0 */
+       u32     srdscr1;        /* 0x04 - SRDS Control Register 1 */
+       u32     srdscr2;        /* 0x08 - SRDS Control Register 2 */
+       u32     srdscr3;        /* 0x0C - SRDS Control Register 3 */
+       u32     srdscr4;        /* 0x10 - SRDS Control Register 4 */
+} serdes_85xx_t;
+#define FSL_SRDSCR3_EIC0(x)    (((x) & 0x1f) << 8)
+#define FSL_SRDSCR3_EIC0_MASK  FSL_SRDSCR3_EIC0(0x1f)
+#define FSL_SRDSCR3_EIC1(x)    (((x) & 0x1f) << 0)
+#define FSL_SRDSCR3_EIC1_MASK  FSL_SRDSCR3_EIC1(0x1f)
+#define FSL_SRDSCR4_EIC2(x)    (((x) & 0x1f) << 8)
+#define FSL_SRDSCR4_EIC2_MASK  FSL_SRDSCR4_EIC2(0x1f)
+#define FSL_SRDSCR4_EIC3(x)    (((x) & 0x1f) << 0)
+#define FSL_SRDSCR4_EIC3_MASK  FSL_SRDSCR4_EIC3(0x1f)
+#define EIC_PCIE       0x13
+#define EIC_SGMII      0x04
+
 #define SRDS1_MAX_LANES                4
 
 static u32 serdes1_prtcl_map;
@@ -45,10 +63,13 @@ int is_serdes_configured(enum srds_prtcl prtcl)
 void fsl_serdes_init(void)
 {
        ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+       serdes_85xx_t *serdes = (void *)CONFIG_SYS_MPC85xx_SERDES1_ADDR;
+
        u32 pordevsr = in_be32(&gur->pordevsr);
        u32 srds_cfg = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >>
                                MPC85xx_PORDEVSR_IO_SEL_SHIFT;
        int lane;
+       u32 mask, val;
 
        debug("PORDEVSR[IO_SEL_SRDS] = %x\n", srds_cfg);
 
@@ -61,4 +82,30 @@ void fsl_serdes_init(void)
                enum srds_prtcl lane_prtcl = serdes1_cfg_tbl[srds_cfg][lane];
                serdes1_prtcl_map |= (1 << lane_prtcl);
        }
+
+       /* Init SERDES Receiver electrical idle detection control for PCIe */
+
+       /* Lane 0 is always PCIe 1 */
+       mask = FSL_SRDSCR3_EIC0_MASK;
+       val = FSL_SRDSCR3_EIC0(EIC_PCIE);
+
+       /* Lane 1 */
+       if ((serdes1_cfg_tbl[srds_cfg][1] == PCIE1) ||
+           (serdes1_cfg_tbl[srds_cfg][1] == PCIE2)) {
+               mask |= FSL_SRDSCR3_EIC1_MASK;
+               val |= FSL_SRDSCR3_EIC1(EIC_PCIE);
+       }
+
+       /* Handle lanes 0 & 1 */
+       clrsetbits_be32(&serdes->srdscr3, mask, val);
+
+       /* Handle lanes 2 & 3 */
+       if (srds_cfg == 0x6) {
+               mask = FSL_SRDSCR4_EIC2_MASK | FSL_SRDSCR4_EIC3_MASK;
+               val = FSL_SRDSCR4_EIC2(EIC_PCIE) | FSL_SRDSCR4_EIC3(EIC_PCIE);
+               clrsetbits_be32(&serdes->srdscr4, mask, val);
+       }
+
+       /* 100 ms delay */
+       udelay(100000);
 }