[MTD ONENAND] Fix OneNAND probe

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Tue Sep 26 04:59:01 EDT 2006


Commit:     47e777e02e7b21eaa4686a70069c9583c126aea8
Parent:     b77d95c78fb0ec330cd53e0d297ffa4fd2975e32
commit 47e777e02e7b21eaa4686a70069c9583c126aea8
Author:     Kyungmin Park <kyungmin.park at samsung.com>
AuthorDate: Mon Sep 25 23:53:28 2006 +0000
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Tue Sep 26 09:16:06 2006 +0100

    [MTD ONENAND] Fix OneNAND probe
    
            - fix OneNAND probe whether OneNAND Sync. Burst read mode or not
            - fix OneNAND reset wait problem
    
    Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
---
 drivers/mtd/onenand/onenand_base.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 84ec40d..09aefe2 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1628,6 +1628,12 @@ static int onenand_probe(struct mtd_info
 	int bram_maf_id, bram_dev_id, maf_id, dev_id;
 	int version_id;
 	int density;
+	int syscfg;
+
+	/* Save system configuration 1 */
+	syscfg = this->read_word(this->base + ONENAND_REG_SYS_CFG1);
+	/* Clear Sync. Burst Read mode to read BootRAM */
+	this->write_word((syscfg & ~ONENAND_SYS_CFG1_SYNC_READ), this->base + ONENAND_REG_SYS_CFG1);
 
 	/* Send the command for reading device ID from BootRAM */
 	this->write_word(ONENAND_CMD_READID, this->base + ONENAND_BOOTRAM);
@@ -1636,13 +1642,18 @@ static int onenand_probe(struct mtd_info
 	bram_maf_id = this->read_word(this->base + ONENAND_BOOTRAM + 0x0);
 	bram_dev_id = this->read_word(this->base + ONENAND_BOOTRAM + 0x2);
 
+	/* Reset OneNAND to read default register values */
+	this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_BOOTRAM);
+	/* Wait reset */
+	this->wait(mtd, FL_RESETING);
+
+	/* Restore system configuration 1 */
+	this->write_word(syscfg, this->base + ONENAND_REG_SYS_CFG1);
+
 	/* Check manufacturer ID */
 	if (onenand_check_maf(bram_maf_id))
 		return -ENXIO;
 
-	/* Reset OneNAND to read default register values */
-	this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_BOOTRAM);
-
 	/* Read manufacturer and device IDs from Register */
 	maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID);
 	dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);



More information about the linux-mtd-cvs mailing list