]> git.sur5r.net Git - u-boot/commitdiff
ppc4xx: Add Mnemonics for AMCC/IBM DDR2 SDRAM Controller
authorGrant Erickson <gerickson@nuovations.com>
Wed, 9 Jul 2008 23:46:35 +0000 (16:46 -0700)
committerStefan Roese <sr@denx.de>
Fri, 11 Jul 2008 11:18:13 +0000 (13:18 +0200)
This patch completes the preprocessor mneomics for the IBM DDR2 SDRAM
controller registers (MODT and INITPLR) used by the
PowerPC405EX(r). The MMODE and MEMODE registers are unified with their
peer values used for the INITPLR MR and EMR registers,
respectively. Finally, a spelling typo is correct (MANUEL to MANUAL).

With these mnemonics in place, the CFG_SDRAM0_* magic numbers for
Kilauea are replaced by equivalent mnemonics to make it easier to
compare and contrast other 405EX(r)-based boards (e.g. during board
bring-up).

Finally, unified the SDRAM controller register dump routine such that
it can be used across all processor variants that utilize the IBM DDR2
SDRAM controller core. It produces output of the form:

PPC4xx IBM DDR2 Register Dump:
...
        SDRAM_MB0CF[40] = 0x00006701
...

which is '<mnemonic>[<DCR #>] = <value>'. The DCR number is included
since it is not uncommon that the DCR values in header files get mixed
up and it helps to validate, at a glance, they match what is printed
in the user manual.

Tested on:
  AMCC Kilauea/Haleakala:
  - NFS Linux Boot: PASSED
  - NAND Linux Boot: PASSED

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Signed-off-by: Stefan Roese <sr@denx.de>
cpu/ppc4xx/44x_spd_ddr2.c
include/asm-ppc/ppc4xx-sdram.h
include/configs/kilauea.h

index f813ba604dde1af8b1f79ac2790660f140f49aac..d7f20a17817739a81590216fa31b75cf1bb18719 100644 (file)
@@ -50,6 +50,8 @@
 
 #include "ecc.h"
 
+static void ppc4xx_ibm_ddr2_register_dump(void);
+
 #if defined(CONFIG_SPD_EEPROM) &&                              \
        (defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
         defined(CONFIG_460EX) || defined(CONFIG_460GT)  || \
@@ -258,7 +260,6 @@ static void test(void);
 #else
 static void    DQS_calibration_process(void);
 #endif
-static void ppc440sp_sdram_register_dump(void);
 int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 void dcbz_area(u32 start_address, u32 num_bytes);
 
@@ -608,7 +609,7 @@ phys_size_t initdram(int board_type)
        remove_tlb(0, dram_size);
        program_tlb(0, 0, dram_size, MY_TLB_WORD2_I_ENABLE);
 
-       ppc440sp_sdram_register_dump();
+       ppc4xx_ibm_ddr2_register_dump();
 
        /*
         * Clear potential errors resulting from auto-calibration.
@@ -2761,7 +2762,7 @@ calibration_loop:
                printf("\nERROR: Cannot determine a common read delay for the "
                       "DIMM(s) installed.\n");
                debug("%s[%d] ERROR : \n", __FUNCTION__,__LINE__);
-               ppc440sp_sdram_register_dump();
+               ppc4xx_ibm_ddr2_register_dump();
                spd_ddr_init_hang ();
        }
 
@@ -2947,168 +2948,6 @@ static void test(void)
 }
 #endif
 
-#if defined(DEBUG)
-static void ppc440sp_sdram_register_dump(void)
-{
-       unsigned int sdram_reg;
-       unsigned int sdram_data;
-       unsigned int dcr_data;
-
-       printf("\n  Register Dump:\n");
-       sdram_reg = SDRAM_MCSTAT;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MCSTAT    = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_MCOPT1;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MCOPT1    = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_MCOPT2;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MCOPT2    = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_MODT0;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MODT0     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_MODT1;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MODT1     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_MODT2;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MODT2     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_MODT3;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MODT3     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_CODT;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_CODT      = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_VVPR;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_VVPR      = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_OPARS;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_OPARS     = 0x%08X\n", sdram_data);
-       /*
-        * OPAR2 is only used as a trigger register.
-        * No data is contained in this register, and reading or writing
-        * to is can cause bad things to happen (hangs).  Just skip it
-        * and report NA
-        * sdram_reg = SDRAM_OPAR2;
-        * mfsdram(sdram_reg, sdram_data);
-        * printf("        SDRAM_OPAR2     = 0x%08X\n", sdram_data);
-        */
-       printf("        SDRAM_OPART     = N/A       ");
-       sdram_reg = SDRAM_RTR;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_RTR       = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_MB0CF;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MB0CF     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_MB1CF;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MB1CF     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_MB2CF;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MB2CF     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_MB3CF;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MB3CF     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR0;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR0  = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR1;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR1  = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR2;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR2  = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR3;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR3  = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR4;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR4  = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR5;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR5  = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR6;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR6  = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR7;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR7  = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR8;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR8  = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR9;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR9  = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR10;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR10 = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR11;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR11 = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR12;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR12 = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR13;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR13 = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_INITPLR14;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR14 = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_INITPLR15;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_INITPLR15 = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_RQDC;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_RQDC      = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_RFDC;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_RFDC      = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_RDCC;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_RDCC      = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_DLCR;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_DLCR      = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_CLKTR;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_CLKTR     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_WRDTR;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_WRDTR     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_SDTR1;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_SDTR1     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_SDTR2;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_SDTR2     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_SDTR3;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_SDTR3     = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_MMODE;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MMODE     = 0x%08X\n", sdram_data);
-       sdram_reg = SDRAM_MEMODE;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_MEMODE    = 0x%08X", sdram_data);
-       sdram_reg = SDRAM_ECCCR;
-       mfsdram(sdram_reg, sdram_data);
-       printf("        SDRAM_ECCCR     = 0x%08X\n\n", sdram_data);
-
-       dcr_data = mfdcr(SDRAM_R0BAS);
-       printf("        MQ0_B0BAS       = 0x%08X", dcr_data);
-       dcr_data = mfdcr(SDRAM_R1BAS);
-       printf("        MQ1_B0BAS       = 0x%08X\n", dcr_data);
-       dcr_data = mfdcr(SDRAM_R2BAS);
-       printf("        MQ2_B0BAS       = 0x%08X", dcr_data);
-       dcr_data = mfdcr(SDRAM_R3BAS);
-       printf("        MQ3_B0BAS       = 0x%08X\n", dcr_data);
-}
-#else /* !defined(DEBUG) */
-static void ppc440sp_sdram_register_dump(void)
-{
-}
-#endif /* defined(DEBUG) */
 #elif defined(CONFIG_405EX)
 /*-----------------------------------------------------------------------------
  * Function:   initdram
@@ -3223,8 +3062,101 @@ phys_size_t initdram(int board_type)
 #if defined(CONFIG_DDR_ECC)
        ecc_init(CFG_SDRAM_BASE, CFG_MBYTES_SDRAM << 20);
 #endif /* defined(CONFIG_DDR_ECC) */
+
+       ppc4xx_ibm_ddr2_register_dump();
 #endif /* !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) */
 
        return (CFG_MBYTES_SDRAM << 20);
 }
 #endif /* defined(CONFIG_SPD_EEPROM) && defined(CONFIG_440SP) || ... */
+
+static void ppc4xx_ibm_ddr2_register_dump(void)
+{
+#if defined(DEBUG) && defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2)
+#define PPC4xx_IBM_DDR2_DUMP_REGISTER(mnemonic)                                \
+       do {                                                            \
+               u32 data;                                               \
+               mfsdram(SDRAM_##mnemonic, data);                        \
+               printf("%20s[%02x] = 0x%08X\n",                         \
+                      "SDRAM_" #mnemonic, SDRAM_##mnemonic, data);     \
+       } while (0)
+
+       printf("\nPPC4xx IBM DDR2 Register Dump:\n");
+
+#if (defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
+     defined(CONFIG_460EX) || defined(CONFIG_460GT))
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(R0BAS);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(R1BAS);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(R2BAS);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(R3BAS);
+#endif /* (defined(CONFIG_440SP) || ... */
+#if defined(CONFIG_405EX)
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(BESR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(BEARL);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(BEARH);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(WMIRQ);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(PLBOPT);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(PUABA);
+#endif /* defined(CONFIG_405EX) */
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MB0CF);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MB1CF);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MB2CF);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MB3CF);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MCSTAT);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MCOPT1);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MCOPT2);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MODT0);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MODT1);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MODT2);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MODT3);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(CODT);
+#if (defined(CONFIG_440SP) || defined(CONFIG_440SPE) ||        \
+     defined(CONFIG_460EX) || defined(CONFIG_460GT))
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(VVPR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(OPARS);
+       /*
+        * OPART is only used as a trigger register.
+        *
+        * No data is contained in this register, and reading or writing
+        * to is can cause bad things to happen (hangs). Just skip it and
+        * report "N/A".
+        */
+       printf("%20s = N/A\n", "SDRAM_OPART");
+#endif /* defined(CONFIG_440SP) || ... */
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(RTR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR0);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR1);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR2);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR3);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR4);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR5);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR6);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR7);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR8);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR9);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR10);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR11);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR12);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR13);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR14);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(INITPLR15);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(RQDC);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(RFDC);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(RDCC);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(DLCR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(CLKTR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(WRDTR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(SDTR1);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(SDTR2);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(SDTR3);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MMODE);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(MEMODE);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(ECCCR);
+#if (defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
+     defined(CONFIG_460EX) || defined(CONFIG_460GT))
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(CID);
+#endif /* defined(CONFIG_440SP) || ... */
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(RID);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(FCSR);
+       PPC4xx_IBM_DDR2_DUMP_REGISTER(RTSR);
+#endif /* defined(DEBUG)  && defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2) */
index d01e07e8baa85f71556ab03ff3c35fc9592d9967..df787b3d4c7d961a2031263916956a3135f9a1da 100644 (file)
  * SDRAM Delay Line Calibration Register
  */
 #define SDRAM_DLCR_DCLM_MASK           0x80000000
-#define SDRAM_DLCR_DCLM_MANUEL         0x80000000
+#define SDRAM_DLCR_DCLM_MANUAL         0x80000000
 #define SDRAM_DLCR_DCLM_AUTO           0x00000000
 #define SDRAM_DLCR_DLCR_MASK           0x08000000
 #define SDRAM_DLCR_DLCR_CALIBRATE      0x08000000
 #define SDRAM_DLCR_DLCV_ENCODE(n)      ((((u32)(n))&0x1FF)<<0)
 #define SDRAM_DLCR_DLCV_DECODE(n)      ((((u32)(n))>>0)&0x1FF)
 
+/*
+ * SDRAM Memory On Die Terimination Control Register
+ */
+#define SDRAM_MODT_ODTON_DISABLE               PPC_REG_VAL(0, 0)
+#define SDRAM_MODT_ODTON_ENABLE                        PPC_REG_VAL(0, 1)
+#define SDRAM_MODT_EB1W_DISABLE                        PPC_REG_VAL(1, 0)
+#define SDRAM_MODT_EB1W_ENABLE                 PPC_REG_VAL(1, 1)
+#define SDRAM_MODT_EB1R_DISABLE                        PPC_REG_VAL(2, 0)
+#define SDRAM_MODT_EB1R_ENABLE                 PPC_REG_VAL(2, 1)
+#define SDRAM_MODT_EB0W_DISABLE                        PPC_REG_VAL(7, 0)
+#define SDRAM_MODT_EB0W_ENABLE                 PPC_REG_VAL(7, 1)
+#define SDRAM_MODT_EB0R_DISABLE                        PPC_REG_VAL(8, 0)
+#define SDRAM_MODT_EB0R_ENABLE                 PPC_REG_VAL(8, 1)
+
 /*
  * SDRAM Controller On Die Termination Register
  */
-#define SDRAM_CODT_ODT_ON                      0x80000000
-#define SDRAM_CODT_ODT_OFF                     0x00000000
-#define SDRAM_CODT_DQS_VOLTAGE_DDR_MASK                0x00000020
-#define SDRAM_CODT_DQS_2_5_V_DDR1              0x00000000
-#define SDRAM_CODT_DQS_1_8_V_DDR2              0x00000020
-#define SDRAM_CODT_DQS_MASK                    0x00000010
-#define SDRAM_CODT_DQS_DIFFERENTIAL            0x00000000
-#define SDRAM_CODT_DQS_SINGLE_END              0x00000010
-#define SDRAM_CODT_CKSE_DIFFERENTIAL           0x00000000
-#define SDRAM_CODT_CKSE_SINGLE_END             0x00000008
-#define SDRAM_CODT_FEEBBACK_RCV_SINGLE_END     0x00000004
-#define SDRAM_CODT_FEEBBACK_DRV_SINGLE_END     0x00000002
-#define SDRAM_CODT_IO_HIZ                      0x00000000
-#define SDRAM_CODT_IO_NMODE                    0x00000001
+#define SDRAM_CODT_ODT_ON                      PPC_REG_VAL(0, 1)
+#define SDRAM_CODT_ODT_OFF                     PPC_REG_VAL(0, 0)
+#define SDRAM_CODT_RK1W_ON                     PPC_REG_VAL(1, 1)
+#define SDRAM_CODT_RK1W_OFF                    PPC_REG_VAL(1, 0)
+#define SDRAM_CODT_RK1R_ON                     PPC_REG_VAL(2, 1)
+#define SDRAM_CODT_RK1R_OFF                    PPC_REG_VAL(2, 0)
+#define SDRAM_CODT_RK0W_ON                     PPC_REG_VAL(7, 1)
+#define SDRAM_CODT_RK0W_OFF                    PPC_REG_VAL(7, 0)
+#define SDRAM_CODT_RK0R_ON                     PPC_REG_VAL(8, 1)
+#define SDRAM_CODT_RK0R_OFF                    PPC_REG_VAL(8, 0)
+#define SDRAM_CODT_ODTSH_NORMAL                        PPC_REG_VAL(10, 0)
+#define SDRAM_CODT_ODTSH_REMOVE_ONE_AT_END     PPC_REG_VAL(10, 1)
+#define SDRAM_CODT_ODTSH_ADD_ONE_AT_START      PPC_REG_VAL(10, 2)
+#define SDRAM_CODT_ODTSH_SHIFT_ONE_EARLIER     PPC_REG_VAL(10, 3)
+#define SDRAM_CODT_CODTZ_75OHM                 PPC_REG_VAL(11, 0)
+#define SDRAM_CODT_CKEG_ON                     PPC_REG_VAL(12, 1)
+#define SDRAM_CODT_CKEG_OFF                    PPC_REG_VAL(12, 0)
+#define SDRAM_CODT_CTLG_ON                     PPC_REG_VAL(13, 1)
+#define SDRAM_CODT_CTLG_OFF                    PPC_REG_VAL(13, 0)
+#define SDRAM_CODT_FBDG_ON                     PPC_REG_VAL(14, 1)
+#define SDRAM_CODT_FBDG_OFF                    PPC_REG_VAL(14, 0)
+#define SDRAM_CODT_FBRG_ON                     PPC_REG_VAL(15, 1)
+#define SDRAM_CODT_FBRG_OFF                    PPC_REG_VAL(15, 0)
+#define SDRAM_CODT_CKLZ_36OHM                  PPC_REG_VAL(18, 1)
+#define SDRAM_CODT_CKLZ_18OHM                  PPC_REG_VAL(18, 0)
+#define SDRAM_CODT_DQS_VOLTAGE_DDR_MASK                PPC_REG_VAL(26, 1)
+#define SDRAM_CODT_DQS_2_5_V_DDR1              PPC_REG_VAL(26, 0)
+#define SDRAM_CODT_DQS_1_8_V_DDR2              PPC_REG_VAL(26, 1)
+#define SDRAM_CODT_DQS_MASK                    PPC_REG_VAL(27, 1)
+#define SDRAM_CODT_DQS_DIFFERENTIAL            PPC_REG_VAL(27, 0)
+#define SDRAM_CODT_DQS_SINGLE_END              PPC_REG_VAL(27, 1)
+#define SDRAM_CODT_CKSE_DIFFERENTIAL           PPC_REG_VAL(28, 0)
+#define SDRAM_CODT_CKSE_SINGLE_END             PPC_REG_VAL(28, 1)
+#define SDRAM_CODT_FEEBBACK_RCV_SINGLE_END     PPC_REG_VAL(29, 1)
+#define SDRAM_CODT_FEEBBACK_DRV_SINGLE_END     PPC_REG_VAL(30, 1)
+#define SDRAM_CODT_IO_HIZ                      PPC_REG_VAL(31, 0)
+#define SDRAM_CODT_IO_NMODE                    PPC_REG_VAL(31, 1)
+
+/*
+ * SDRAM Initialization Preload Register
+ */
+#define SDRAM_INITPLR_ENABLE                   PPC_REG_VAL(0, 1)
+#define SDRAM_INITPLR_DISABLE                  PPC_REG_VAL(0, 0)
+#define SDRAM_INITPLR_IMWT_MASK                        PPC_REG_VAL(8, 0xFF)
+#define SDRAM_INITPLR_IMWT_ENCODE(n)           PPC_REG_VAL(8, \
+                                                           (static_cast(u32, \
+                                                                        n)) \
+                                                           & 0xFF)
+#define SDRAM_INITPLR_ICMD_MASK                        PPC_REG_VAL(12, 0x7)
+#define SDRAM_INITPLR_ICMD_ENCODE(n)           PPC_REG_VAL(12, \
+                                                           (static_cast(u32, \
+                                                                        n)) \
+                                                           & 0x7)
+#define SDRAM_INITPLR_IBA_MASK                 PPC_REG_VAL(15, 0x7)
+#define SDRAM_INITPLR_IBA_ENCODE(n)            PPC_REG_VAL(15, \
+                                                           (static_cast(u32, \
+                                                                        n)) \
+                                                           & 0x7)
+#define SDRAM_INITPLR_IMA_MASK                 PPC_REG_VAL(31, 0x7FFF)
+#define SDRAM_INITPLR_IMA_ENCODE(n)            PPC_REG_VAL(31, \
+                                                           (static_cast(u32, \
+                                                                        n)) \
+                                                           & 0x7FFF)
+
+/*
+ * JEDEC DDR Initialization Commands
+ */
+#define JEDEC_CMD_NOP                          7
+#define JEDEC_CMD_PRECHARGE                    2
+#define JEDEC_CMD_REFRESH                      1
+#define JEDEC_CMD_EMR                          0
+#define JEDEC_CMD_READ                         5
+#define JEDEC_CMD_WRITE                                4
+
+/*
+ * JEDEC Precharge Command Memory Address Arguments
+ */
+#define JEDEC_MA_PRECHARGE_ONE                 (0 << 10)
+#define JEDEC_MA_PRECHARGE_ALL                 (1 << 10)
+
+/*
+ * JEDEC DDR EMR Command Bank Address Arguments
+ */
+#define JEDEC_BA_MR                            0
+#define JEDEC_BA_EMR                           1
+#define JEDEC_BA_EMR2                          2
+#define JEDEC_BA_EMR3                          3
+
+/*
+ * JEDEC DDR Mode Register
+ */
+#define JEDEC_MA_MR_PDMODE_FAST_EXIT           (0 << 12)
+#define JEDEC_MA_MR_PDMODE_SLOW_EXIT           (1 << 12)
+#define JEDEC_MA_MR_WR_MASK                    (0x7 << 9)
+#define JEDEC_MA_MR_WR_DDR1                    (0x0 << 9)
+#define JEDEC_MA_MR_WR_DDR2_2_CYC              (0x1 << 9)
+#define JEDEC_MA_MR_WR_DDR2_3_CYC              (0x2 << 9)
+#define JEDEC_MA_MR_WR_DDR2_4_CYC              (0x3 << 9)
+#define JEDEC_MA_MR_WR_DDR2_5_CYC              (0x4 << 9)
+#define JEDEC_MA_MR_WR_DDR2_6_CYC              (0x5 << 9)
+#define JEDEC_MA_MR_DLL_RESET                  (1 << 8)
+#define JEDEC_MA_MR_MODE_NORMAL                        (0 << 8)
+#define JEDEC_MA_MR_MODE_TEST                  (1 << 8)
+#define JEDEC_MA_MR_CL_MASK                    (0x7 << 4)
+#define JEDEC_MA_MR_CL_DDR1_2_0_CLK            (0x2 << 4)
+#define JEDEC_MA_MR_CL_DDR1_2_5_CLK            (0x6 << 4)
+#define JEDEC_MA_MR_CL_DDR1_3_0_CLK            (0x3 << 4)
+#define JEDEC_MA_MR_CL_DDR2_2_0_CLK            (0x2 << 4)
+#define JEDEC_MA_MR_CL_DDR2_3_0_CLK            (0x3 << 4)
+#define JEDEC_MA_MR_CL_DDR2_4_0_CLK            (0x4 << 4)
+#define JEDEC_MA_MR_CL_DDR2_5_0_CLK            (0x5 << 4)
+#define JEDEC_MA_MR_CL_DDR2_6_0_CLK            (0x6 << 4)
+#define JEDEC_MA_MR_CL_DDR2_7_0_CLK            (0x7 << 4)
+#define JEDEC_MA_MR_BTYP_SEQUENTIAL            (0 << 3)
+#define JEDEC_MA_MR_BTYP_INTERLEAVED           (1 << 3)
+#define JEDEC_MA_MR_BLEN_MASK                  (0x7 << 0)
+#define JEDEC_MA_MR_BLEN_4                     (2 << 0)
+#define JEDEC_MA_MR_BLEN_8                     (3 << 0)
+
+/*
+ * JEDEC DDR Extended Mode Register
+ */
+#define JEDEC_MA_EMR_OUTPUT_MASK               (1 << 12)
+#define JEDEC_MA_EMR_OUTPUT_ENABLE             (0 << 12)
+#define JEDEC_MA_EMR_OUTPUT_DISABLE            (1 << 12)
+#define JEDEC_MA_EMR_RQDS_MASK                 (1 << 11)
+#define JEDEC_MA_EMR_RDQS_DISABLE              (0 << 11)
+#define JEDEC_MA_EMR_RDQS_ENABLE               (1 << 11)
+#define JEDEC_MA_EMR_DQS_MASK                  (1 << 10)
+#define JEDEC_MA_EMR_DQS_DISABLE               (1 << 10)
+#define JEDEC_MA_EMR_DQS_ENABLE                        (0 << 10)
+#define JEDEC_MA_EMR_OCD_MASK                  (0x7 << 7)
+#define JEDEC_MA_EMR_OCD_EXIT                  (0 << 7)
+#define JEDEC_MA_EMR_OCD_ENTER                 (7 << 7)
+#define JEDEC_MA_EMR_AL_DDR1_0_CYC             (0 << 3)
+#define JEDEC_MA_EMR_AL_DDR2_1_CYC             (1 << 3)
+#define JEDEC_MA_EMR_AL_DDR2_2_CYC             (2 << 3)
+#define JEDEC_MA_EMR_AL_DDR2_3_CYC             (3 << 3)
+#define JEDEC_MA_EMR_AL_DDR2_4_CYC             (4 << 3)
+#define JEDEC_MA_EMR_RTT_MASK                  (0x11 << 2)
+#define JEDEC_MA_EMR_RTT_DISABLED              (0x00 << 2)
+#define JEDEC_MA_EMR_RTT_75OHM                 (0x01 << 2)
+#define JEDEC_MA_EMR_RTT_150OHM                        (0x10 << 2)
+#define JEDEC_MA_EMR_RTT_50OHM                 (0x11 << 2)
+#define JEDEC_MA_EMR_ODS_MASK                  (1 << 1)
+#define JEDEC_MA_EMR_ODS_NORMAL                        (0 << 1)
+#define JEDEC_MA_EMR_ODS_WEAK                  (1 << 1)
+#define JEDEC_MA_EMR_DLL_MASK                  (1 << 0)
+#define JEDEC_MA_EMR_DLL_ENABLE                        (0 << 0)
+#define JEDEC_MA_EMR_DLL_DISABLE               (1 << 0)
+
+/*
+ * JEDEC DDR Extended Mode Register 2
+ */
+#define JEDEC_MA_EMR2_TEMP_COMMERCIAL          (0 << 7)
+#define JEDEC_MA_EMR2_TEMP_INDUSTRIAL          (1 << 7)
 
 /*
- * SDRAM Mode Register
+ * SDRAM Mode Register (Corresponds 1:1 w/ JEDEC Mode Register)
  */
-#define SDRAM_MMODE_WR_MASK            0x00000E00
-#define SDRAM_MMODE_WR_DDR1            0x00000000
-#define SDRAM_MMODE_WR_DDR2_3_CYC      0x00000400
-#define SDRAM_MMODE_WR_DDR2_4_CYC      0x00000600
-#define SDRAM_MMODE_WR_DDR2_5_CYC      0x00000800
-#define SDRAM_MMODE_WR_DDR2_6_CYC      0x00000A00
-#define SDRAM_MMODE_DCL_MASK           0x00000070
-#define SDRAM_MMODE_DCL_DDR1_2_0_CLK   0x00000020
-#define SDRAM_MMODE_DCL_DDR1_2_5_CLK   0x00000060
-#define SDRAM_MMODE_DCL_DDR1_3_0_CLK   0x00000030
-#define SDRAM_MMODE_DCL_DDR2_2_0_CLK   0x00000020
-#define SDRAM_MMODE_DCL_DDR2_3_0_CLK   0x00000030
-#define SDRAM_MMODE_DCL_DDR2_4_0_CLK   0x00000040
-#define SDRAM_MMODE_DCL_DDR2_5_0_CLK   0x00000050
-#define SDRAM_MMODE_DCL_DDR2_6_0_CLK   0x00000060
-#define SDRAM_MMODE_DCL_DDR2_7_0_CLK   0x00000070
+#define SDRAM_MMODE_WR_MASK                    JEDEC_MA_MR_WR_MASK
+#define SDRAM_MMODE_WR_DDR1                    JEDEC_MA_MR_WR_DDR1
+#define SDRAM_MMODE_WR_DDR2_2_CYC              JEDEC_MA_MR_WR_DDR2_2_CYC
+#define SDRAM_MMODE_WR_DDR2_3_CYC              JEDEC_MA_MR_WR_DDR2_3_CYC
+#define SDRAM_MMODE_WR_DDR2_4_CYC              JEDEC_MA_MR_WR_DDR2_4_CYC
+#define SDRAM_MMODE_WR_DDR2_5_CYC              JEDEC_MA_MR_WR_DDR2_5_CYC
+#define SDRAM_MMODE_WR_DDR2_6_CYC              JEDEC_MA_MR_WR_DDR2_6_CYC
+#define SDRAM_MMODE_DCL_MASK                   JEDEC_MA_MR_CL_MASK
+#define SDRAM_MMODE_DCL_DDR1_2_0_CLK           JEDEC_MA_MR_CL_DDR1_2_0_CLK
+#define SDRAM_MMODE_DCL_DDR1_2_5_CLK           JEDEC_MA_MR_CL_DDR1_2_5_CLK
+#define SDRAM_MMODE_DCL_DDR1_3_0_CLK           JEDEC_MA_MR_CL_DDR1_3_0_CLK
+#define SDRAM_MMODE_DCL_DDR2_2_0_CLK           JEDEC_MA_MR_CL_DDR2_2_0_CLK
+#define SDRAM_MMODE_DCL_DDR2_3_0_CLK           JEDEC_MA_MR_CL_DDR2_3_0_CLK
+#define SDRAM_MMODE_DCL_DDR2_4_0_CLK           JEDEC_MA_MR_CL_DDR2_4_0_CLK
+#define SDRAM_MMODE_DCL_DDR2_5_0_CLK           JEDEC_MA_MR_CL_DDR2_5_0_CLK
+#define SDRAM_MMODE_DCL_DDR2_6_0_CLK           JEDEC_MA_MR_CL_DDR2_6_0_CLK
+#define SDRAM_MMODE_DCL_DDR2_7_0_CLK           JEDEC_MA_MR_CL_DDR2_7_0_CLK
+#define SDRAM_MMODE_BTYP_SEQUENTIAL            JEDEC_MA_MR_BTYP_SEQUENTIAL
+#define SDRAM_MMODE_BTYP_INTERLEAVED           JEDEC_MA_MR_BTYP_INTERLEAVED
+#define SDRAM_MMODE_BLEN_MASK                  JEDEC_MA_MR_BLEN_MASK
+#define SDRAM_MMODE_BLEN_4                     JEDEC_MA_MR_BLEN_4
+#define SDRAM_MMODE_BLEN_8                     JEDEC_MA_MR_BLEN_8
 
 /*
- * SDRAM Extended Mode Register
+ * SDRAM Extended Mode Register (Corresponds 1:1 w/ JEDEC Extended
+ * Mode Register)
  */
-#define SDRAM_MEMODE_DIC_MASK          0x00000002
-#define SDRAM_MEMODE_DIC_NORMAL                0x00000000
-#define SDRAM_MEMODE_DIC_WEAK          0x00000002
-#define SDRAM_MEMODE_DLL_MASK          0x00000001
-#define SDRAM_MEMODE_DLL_DISABLE       0x00000001
-#define SDRAM_MEMODE_DLL_ENABLE                0x00000000
-#define SDRAM_MEMODE_RTT_MASK          0x00000044
-#define SDRAM_MEMODE_RTT_DISABLED      0x00000000
-#define SDRAM_MEMODE_RTT_75OHM         0x00000004
-#define SDRAM_MEMODE_RTT_150OHM                0x00000040
-#define SDRAM_MEMODE_DQS_MASK          0x00000400
-#define SDRAM_MEMODE_DQS_DISABLE       0x00000400
-#define SDRAM_MEMODE_DQS_ENABLE                0x00000000
+#define SDRAM_MEMODE_QOFF_MASK                 JEDEC_MA_EMR_OUTPUT_MASK
+#define SDRAM_MEMODE_QOFF_DISABLE              JEDEC_MA_EMR_OUTPUT_DISABLE
+#define SDRAM_MEMODE_QOFF_ENABLE               JEDEC_MA_EMR_OUTPUT_ENABLE
+#define SDRAM_MEMODE_RDQS_MASK                 JEDEC_MA_EMR_RQDS_MASK
+#define SDRAM_MEMODE_RDQS_DISABLE              JEDEC_MA_EMR_RDQS_DISABLE
+#define SDRAM_MEMODE_RDQS_ENABLE               JEDEC_MA_EMR_RDQS_ENABLE
+#define SDRAM_MEMODE_DQS_MASK                  JEDEC_MA_EMR_DQS_MASK
+#define SDRAM_MEMODE_DQS_DISABLE               JEDEC_MA_EMR_DQS_DISABLE
+#define SDRAM_MEMODE_DQS_ENABLE                        JEDEC_MA_EMR_DQS_ENABLE
+#define SDRAM_MEMODE_AL_DDR1_0_CYC             JEDEC_MA_EMR_AL_DDR1_0_CYC
+#define SDRAM_MEMODE_AL_DDR2_1_CYC             JEDEC_MA_EMR_AL_DDR2_1_CYC
+#define SDRAM_MEMODE_AL_DDR2_2_CYC             JEDEC_MA_EMR_AL_DDR2_2_CYC
+#define SDRAM_MEMODE_AL_DDR2_3_CYC             JEDEC_MA_EMR_AL_DDR2_3_CYC
+#define SDRAM_MEMODE_AL_DDR2_4_CYC             JEDEC_MA_EMR_AL_DDR2_4_CYC
+#define SDRAM_MEMODE_RTT_MASK                  JEDEC_MA_EMR_RTT_MASK
+#define SDRAM_MEMODE_RTT_DISABLED              JEDEC_MA_EMR_RTT_DISABLED
+#define SDRAM_MEMODE_RTT_75OHM                 JEDEC_MA_EMR_RTT_75OHM
+#define SDRAM_MEMODE_RTT_150OHM                        JEDEC_MA_EMR_RTT_150OHM
+#define SDRAM_MEMODE_RTT_50OHM                 JEDEC_MA_EMR_RTT_50OHM
+#define SDRAM_MEMODE_DIC_MASK                  JEDEC_MA_EMR_ODS_MASK
+#define SDRAM_MEMODE_DIC_NORMAL                        JEDEC_MA_EMR_ODS_NORMAL
+#define SDRAM_MEMODE_DIC_WEAK                  JEDEC_MA_EMR_ODS_WEAK
+#define SDRAM_MEMODE_DLL_MASK                  JEDEC_MA_EMR_DLL_MASK
+#define SDRAM_MEMODE_DLL_DISABLE               JEDEC_MA_EMR_DLL_DISABLE
+#define SDRAM_MEMODE_DLL_ENABLE                        JEDEC_MA_EMR_DLL_ENABLE
 
 /*
  * SDRAM Clock Timing Register
index 9c1a3a4c1e5f4d042a23ae1592bd2358cfd215fe..f3d048cb7ed887165efc94184097168daea6078c 100644 (file)
 #define CFG_SDRAM0_MB1CF       SDRAM_RXBAS_SDBE_DISABLE
 #define CFG_SDRAM0_MB2CF       SDRAM_RXBAS_SDBE_DISABLE
 #define CFG_SDRAM0_MB3CF       SDRAM_RXBAS_SDBE_DISABLE
-#define CFG_SDRAM0_MCOPT1      0x04322000
+#define CFG_SDRAM0_MCOPT1      (SDRAM_MCOPT1_PMU_OPEN          | \
+                                SDRAM_MCOPT1_8_BANKS           | \
+                                SDRAM_MCOPT1_DDR2_TYPE         | \
+                                SDRAM_MCOPT1_QDEP              | \
+                                SDRAM_MCOPT1_DCOO_DISABLED)
 #define CFG_SDRAM0_MCOPT2      0x00000000
-#define CFG_SDRAM0_MODT0       0x01800000
+#define CFG_SDRAM0_MODT0       (SDRAM_MODT_EB0W_ENABLE | \
+                                SDRAM_MODT_EB0R_ENABLE)
 #define CFG_SDRAM0_MODT1       0x00000000
-#define CFG_SDRAM0_CODT                0x0080f837
-#define CFG_SDRAM0_RTR         0x06180000
-#define CFG_SDRAM0_INITPLR0    0xa8380000
-#define CFG_SDRAM0_INITPLR1    0x81900400
-#define CFG_SDRAM0_INITPLR2    0x81020000
-#define CFG_SDRAM0_INITPLR3    0x81030000
-#define CFG_SDRAM0_INITPLR4    0x81010404
-#define CFG_SDRAM0_INITPLR5    0x81000542
-#define CFG_SDRAM0_INITPLR6    0x81900400
-#define CFG_SDRAM0_INITPLR7    0x8D080000
-#define CFG_SDRAM0_INITPLR8    0x8D080000
-#define CFG_SDRAM0_INITPLR9    0x8D080000
-#define CFG_SDRAM0_INITPLR10   0x8D080000
-#define CFG_SDRAM0_INITPLR11   0x81000442
-#define CFG_SDRAM0_INITPLR12   0x81010780
-#define CFG_SDRAM0_INITPLR13   0x81010400
-#define CFG_SDRAM0_INITPLR14   0x00000000
-#define CFG_SDRAM0_INITPLR15   0x00000000
-#define CFG_SDRAM0_RQDC                0x80000038
-#define CFG_SDRAM0_RFDC                0x00000209
-#define CFG_SDRAM0_RDCC                0x40000000
-#define CFG_SDRAM0_DLCR                0x030000a5
-#define CFG_SDRAM0_CLKTR       0x80000000
+#define CFG_SDRAM0_CODT                (SDRAM_CODT_RK0R_ON             | \
+                                SDRAM_CODT_CKLZ_36OHM          | \
+                                SDRAM_CODT_DQS_1_8_V_DDR2      | \
+                                SDRAM_CODT_IO_NMODE)
+#define CFG_SDRAM0_RTR         SDRAM_RTR_RINT_ENCODE(1560)
+#define CFG_SDRAM0_INITPLR0    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(80)                           | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_NOP))
+#define CFG_SDRAM0_INITPLR1    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(3)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_PRECHARGE)          | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_MR)                   | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_PRECHARGE_ALL))
+#define CFG_SDRAM0_INITPLR2    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_EMR2)                 | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_EMR2_TEMP_COMMERCIAL))
+#define CFG_SDRAM0_INITPLR3    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_EMR3)                 | \
+               SDRAM_INITPLR_IMA_ENCODE(0))
+#define CFG_SDRAM0_INITPLR4    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_EMR)                  | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_EMR_DQS_DISABLE | \
+                                        JEDEC_MA_EMR_RTT_75OHM))
+#define CFG_SDRAM0_INITPLR5    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_MR)                   | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_MR_WR_DDR2_3_CYC | \
+                                        JEDEC_MA_MR_CL_DDR2_4_0_CLK | \
+                                        JEDEC_MA_MR_BLEN_4 | \
+                                        JEDEC_MA_MR_DLL_RESET))
+#define CFG_SDRAM0_INITPLR6    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(3)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_PRECHARGE)          | \
+               SDRAM_INITPLR_IBA_ENCODE(0x0)                           | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_PRECHARGE_ALL))
+#define CFG_SDRAM0_INITPLR7    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(26)                           | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_REFRESH))
+#define CFG_SDRAM0_INITPLR8    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(26)                           | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_REFRESH))
+#define CFG_SDRAM0_INITPLR9    (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(26)                           | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_REFRESH))
+#define CFG_SDRAM0_INITPLR10   (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(26)                           | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_REFRESH))
+#define CFG_SDRAM0_INITPLR11   (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_MR)                   | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_MR_WR_DDR2_3_CYC | \
+                                        JEDEC_MA_MR_CL_DDR2_4_0_CLK | \
+                                        JEDEC_MA_MR_BLEN_4))
+#define CFG_SDRAM0_INITPLR12   (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_EMR)                  | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_EMR_OCD_ENTER | \
+                                        JEDEC_MA_EMR_RDQS_DISABLE | \
+                                        JEDEC_MA_EMR_DQS_DISABLE | \
+                                        JEDEC_MA_EMR_RTT_DISABLED | \
+                                        JEDEC_MA_EMR_ODS_NORMAL))
+#define CFG_SDRAM0_INITPLR13   (SDRAM_INITPLR_ENABLE                   | \
+               SDRAM_INITPLR_IMWT_ENCODE(2)                            | \
+               SDRAM_INITPLR_ICMD_ENCODE(JEDEC_CMD_EMR)                | \
+               SDRAM_INITPLR_IBA_ENCODE(JEDEC_BA_EMR)                  | \
+               SDRAM_INITPLR_IMA_ENCODE(JEDEC_MA_EMR_OCD_EXIT | \
+                                        JEDEC_MA_EMR_RDQS_DISABLE | \
+                                        JEDEC_MA_EMR_DQS_DISABLE | \
+                                        JEDEC_MA_EMR_RTT_DISABLED | \
+                                        JEDEC_MA_EMR_ODS_NORMAL))
+#define CFG_SDRAM0_INITPLR14   (SDRAM_INITPLR_DISABLE)
+#define CFG_SDRAM0_INITPLR15   (SDRAM_INITPLR_DISABLE)
+#define CFG_SDRAM0_RQDC                (SDRAM_RQDC_RQDE_ENABLE | \
+                                SDRAM_RQDC_RQFD_ENCODE(56))
+#define CFG_SDRAM0_RFDC                SDRAM_RFDC_RFFD_ENCODE(521)
+#define CFG_SDRAM0_RDCC                (SDRAM_RDCC_RDSS_T2)
+#define CFG_SDRAM0_DLCR                (SDRAM_DLCR_DCLM_AUTO           | \
+                                SDRAM_DLCR_DLCS_CONT_DONE      | \
+                                SDRAM_DLCR_DLCV_ENCODE(165))
+#define CFG_SDRAM0_CLKTR       (SDRAM_CLKTR_CLKP_180_DEG_ADV)
 #define CFG_SDRAM0_WRDTR       0x00000000
-#define CFG_SDRAM0_SDTR1       0x80201000
-#define CFG_SDRAM0_SDTR2       0x32204232
-#define CFG_SDRAM0_SDTR3       0x080b0d1a
-#define CFG_SDRAM0_MMODE       0x00000442
-#define CFG_SDRAM0_MEMODE      0x00000404
+#define CFG_SDRAM0_SDTR1       (SDRAM_SDTR1_LDOF_2_CLK | \
+                                SDRAM_SDTR1_RTW_2_CLK  | \
+                                SDRAM_SDTR1_RTRO_1_CLK)
+#define CFG_SDRAM0_SDTR2       (SDRAM_SDTR2_RCD_3_CLK          | \
+                                SDRAM_SDTR2_WTR_2_CLK          | \
+                                SDRAM_SDTR2_XSNR_32_CLK        | \
+                                SDRAM_SDTR2_WPC_4_CLK          | \
+                                SDRAM_SDTR2_RPC_2_CLK          | \
+                                SDRAM_SDTR2_RP_3_CLK           | \
+                                SDRAM_SDTR2_RRD_2_CLK)
+#define CFG_SDRAM0_SDTR3       (SDRAM_SDTR3_RAS_ENCODE(8)      | \
+                                SDRAM_SDTR3_RC_ENCODE(11)      | \
+                                SDRAM_SDTR3_XCS                | \
+                                SDRAM_SDTR3_RFC_ENCODE(26))
+#define CFG_SDRAM0_MMODE       (SDRAM_MMODE_WR_DDR2_3_CYC | \
+                                SDRAM_MMODE_DCL_DDR2_4_0_CLK | \
+                                SDRAM_MMODE_BLEN_4)
+#define CFG_SDRAM0_MEMODE      (SDRAM_MEMODE_DQS_DISABLE | \
+                                SDRAM_MEMODE_RTT_75OHM)
 
 /*-----------------------------------------------------------------------
  * I2C