From b302f78957689fca0390f3fd93d1b1a03fbb69a8 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Tue, 9 Jan 2007 17:55:21 +0200
Subject: [PATCH] --- yaml --- r: 45703 b: refs/heads/master c:
 0fc2ccea4c8fa779053cb6f8984f6da399a81182 h: refs/heads/master i:   45701:
 6d02559d527cbe27c729b9fc86b61012ec768db7   45699:
 cb8e5c58475be38319a6277b5de762d066cdc077   45695:
 c91787ff3eeff8d1cf7bfebbbc49fd7657053e98 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/mtd/onenand/onenand_base.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2ca1c9ca429b..a22aac58c6e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c9f8bfe7ab366a5d2495ebe5d2dc6fd7368122
+refs/heads/master: 0fc2ccea4c8fa779053cb6f8984f6da399a81182
diff --git a/trunk/drivers/mtd/onenand/onenand_base.c b/trunk/drivers/mtd/onenand/onenand_base.c
index 2ea07f5723d1..2da6bb26353e 100644
--- a/trunk/drivers/mtd/onenand/onenand_base.c
+++ b/trunk/drivers/mtd/onenand/onenand_base.c
@@ -710,7 +710,7 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
 	struct mtd_ecc_stats stats;
 	int read = 0, column;
 	int thislen;
-	int ret = 0;
+	int ret = 0, boundary = 0;
 
 	DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
 
@@ -749,6 +749,17 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
  		from += thislen;
  		if (read + thislen < len) {
  			this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
+ 			/*
+ 			 * Chip boundary handling in DDP
+ 			 * Now we issued chip 1 read and pointed chip 1
+ 			 * bufferam so we have to point chip 0 bufferam.
+ 			 */
+ 			if (this->device_id & ONENAND_DEVICE_IS_DDP &&
+ 					unlikely(from == (this->chipsize >> 1))) {
+ 				this->write_word(0, this->base + ONENAND_REG_START_ADDRESS2);
+ 				boundary = 1;
+ 			} else
+ 				boundary = 0;
  			ONENAND_SET_PREV_BUFFERRAM(this);
  		}
  		/* While load is going, read from last bufferRAM */
@@ -758,6 +769,8 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
  		if (read == len)
  			break;
  		/* Set up for next read from bufferRAM */
+ 		if (unlikely(boundary))
+ 			this->write_word(0x8000, this->base + ONENAND_REG_START_ADDRESS2);
  		ONENAND_SET_NEXT_BUFFERRAM(this);
  		buf += thislen;
  		thislen = min_t(int, mtd->writesize, len - read);