s5pc110: OneNAND: Prefetch read enable

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S
index 49b0a32..a3796be 100644 (file)
--- a/board/samsung/universal/lowlevel_init.S
+++ b/board/samsung/universal/lowlevel_init.S
@@ -217,6 +217,24 @@ lowlevel_init:
        /* init system clock */
        bl      system_clock_init
 
+       /* OneNAND Sync Read Support at S5PC110 only
+        * RM[15]       : Sync Read
+        * BRWL[14:12]  : 7 CLK
+        * BL[11:9]     : Continuous
+        * VHF[3]       : Very High Frequency Enable (Over 83MHz)
+        * HF[2]        : High Frequency Enable (Over 66MHz)
+        */
+       cmp     r7, r8
+       ldrne   r1, =0xE004
+       ldrne   r0, =0xB001E442
+       strneh  r1, [r0]
+
+       ldrne   r1, =0x2E004
+       ldrne   r0, =0xB0600000
+       strne   r1, [r0, #0x100]                        @ ONENAND_IF_CTRL
+       ldrne   r1, =0x1212
+       strne   r1, [r0, #0x108]
+
        /* Board detection to set proper memory configuration */
        cmp     r7, r8
        moveq   r9, #1          /* r9 has 1Gib default at s5pc100 */
@@ -271,22 +289,6 @@ lowlevel_init:
 
        bl      mem_ctrl_asm_init
 
-       /* OneNAND Sync Read Support at S5PC110 only
-        * RM[15]       : Sync Read
-        * BRWL[14:12]  : 7 CLK
-        * BL[11:9]     : Continuous
-        * VHF[3]       : Very High Frequency Enable (Over 83MHz)
-        * HF[2]        : High Frequency Enable (Over 66MHz)
-        */
-       cmp     r7, r8
-       ldrne   r1, =0xE00C
-
-       ldrne   r0, =0xB001E442
-       strneh  r1, [r0]
-
-       ldrne   r0, =0xB0600000
-       strne   r1, [r0, #0x100]                        @ ONENAND_IF_CTRL
-
        /* Wakeup support. Don't know if it's going to be used, untested. */
        ldreq   r0, =S5PC100_RST_STAT
        ldrne   r0, =S5PC110_RST_STAT

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 16757d6..d45c78f 100644 (file)
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2634,8 +2634,10 @@ static int onenand_probe(struct mtd_info *mtd)
 
        /* Save system configuration 1 */
        syscfg = this->read_word(this->base + ONENAND_REG_SYS_CFG1);
+#if !defined(CONFIG_S5PC110) && !defined(CONFIG_S5P6442)
        /* Clear Sync. Burst Read mode to read BootRAM */
        this->write_word((syscfg & ~ONENAND_SYS_CFG1_SYNC_READ), this->base + ONENAND_REG_SYS_CFG1);
+#endif
 
        /* Send the command for reading device ID from BootRAM */
        this->write_word(ONENAND_CMD_READID, this->base + ONENAND_BOOTRAM);