aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2005-04-01 17:36:29 +0100
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-05-23 13:07:50 +0200
commitdce2b4da69a83635150a6535ebc23f680e200a8d (patch)
tree1e71cbc8cb0fd495d2c4383ea40d7b045b3d6da6 /drivers
parent81dba488792b29cc8cb2b3d49407be05303dde16 (diff)
downloadmrst-s0i3-test-dce2b4da69a83635150a6535ebc23f680e200a8d.tar.gz
mrst-s0i3-test-dce2b4da69a83635150a6535ebc23f680e200a8d.tar.xz
mrst-s0i3-test-dce2b4da69a83635150a6535ebc23f680e200a8d.zip
[MTD] Fix OTP for top-parameter devices
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/chips/cfi_cmdset_0001.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index dc257eb6932..b99400f6e48 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -4,7 +4,7 @@
*
* (C) 2000 Red Hat. GPL'd
*
- * $Id: cfi_cmdset_0001.c,v 1.174 2005/04/01 01:59:52 nico Exp $
+ * $Id: cfi_cmdset_0001.c,v 1.175 2005/04/01 16:36:25 nico Exp $
*
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
@@ -2062,8 +2062,20 @@ static int cfi_intelext_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
/* we need real chips here not virtual ones */
devsize = (1 << cfi->cfiq->DevSize) * cfi->interleave;
chip_step = devsize >> cfi->chipshift;
+ chip_num = 0;
+
+ /* Some chips have OTP located in the _top_ partition only.
+ For example: Intel 28F256L18T (T means top-parameter device) */
+ if (cfi->mfr == MANUFACTURER_INTEL) {
+ switch (cfi->id) {
+ case 0x880b:
+ case 0x880c:
+ case 0x880d:
+ chip_num = chip_step - 1;
+ }
+ }
- for (chip_num = 0; chip_num < cfi->numchips; chip_num += chip_step) {
+ for ( ; chip_num < cfi->numchips; chip_num += chip_step) {
chip = &cfi->chips[chip_num];
otp = (struct cfi_intelext_otpinfo *)&extp->extra[0];