C66x: remove DDR3 PLL config

[keystone-rtos/ibl.git] / src / hw / ddrs / emif4 / emif4.c

diff --git a/src/hw/ddrs/emif4/emif4.c b/src/hw/ddrs/emif4/emif4.c
index a7f94ddd87ad66f498fa3140724496af45842c11..32b7f6c8be7ae531a96ca0ed6b1936ae9bb59390 100644 (file)
--- a/src/hw/ddrs/emif4/emif4.c
+++ b/src/hw/ddrs/emif4/emif4.c
@@ -16,9 +16,8 @@
 
 #define KICK0                  *(volatile unsigned int*)(CHIP_LEVEL_REG + 0x0038)
 #define KICK1                  *(volatile unsigned int*)(CHIP_LEVEL_REG + 0x003C)
-
-#define DDR3PLLCTL0            *(volatile unsigned int*)(CHIP_LEVEL_REG + 0x0330)
-#define DDR3PLLCTL1            *(unsigned int*)(CHIP_LEVEL_REG + 0x0334)
+#define KICK0_UNLOCK           0x83e70b13
+#define KICK1_UNLOCK           0x95a4f1e0
 
 // DDR3 definitions
 #define DDR_BASE_ADDR 0x21000000
@@ -101,14 +100,10 @@ SINT16 hwEmif4p0Enable (iblEmif4p0_t *cfg)
     if ( (v == DEVICE_C6678_JTAG_ID_VAL) ||
          (v == DEVICE_C6670_JTAG_ID_VAL) )
     {
-        /* 1333 MHz data rate */
-        /***************** 2.2 DDR3 PLL Configuration ************/
-        DDR3PLLCTL1 |= 0x00000040;      //Set ENSAT bit = 1
-        DDR3PLLCTL1 |= 0x00002000;      //Set RESET bit = 1
-        DDR3PLLCTL0 = 0x090804C0;       //Configure CLKR, CLKF, CLKOD, BWADJ
-        ddr3_wait(1000);                //Wait for reset to complete
-        DDR3PLLCTL1 &= ~(0x00002000);   //Clear RESET bit
-        ddr3_wait(1000);                //Wait for PLL lock
+
+
+       KICK0 = KICK0_UNLOCK;
+       KICK1 = KICK1_UNLOCK;
 
         /**************** 3.0 Leveling Register Configuration ********************/
         /* Using partial automatic leveling due to errata */
@@ -205,7 +200,9 @@ SINT16 hwEmif4p0Enable (iblEmif4p0_t *cfg)
          TEMP |= 0x2; // PAGESIZE bit field 2:0
          DDR_SDCFG = TEMP;
 
-         ddr3_wait(1000);             //Wait 600us for HW init to complete
+       for (i = 0; i < 12000; i++) {
+               ddr3_wait(1000);             //Wait 600us for HW init to complete
+       }
 
         DDR_SDRFC = 0x00001450;       //Refresh rate = (7.8*666MHz]
 
@@ -216,7 +213,9 @@ SINT16 hwEmif4p0Enable (iblEmif4p0_t *cfg)
           Actual time = ~10-15 ms */
         DDR_RDWR_LVL_CTRL = 0x80000000; 
 
-        ddr3_wait(1000); //Wait 3ms for leveling to complete
+       for (i = 0; i < 30000; i++) {
+               ddr3_wait(1000); //Wait 3ms for leveling to complete
+       }
     }
     else
     {