diff options
author | Daniel Ribeiro <drwyrm@gmail.com> | 2009-05-17 07:02:08 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-05 12:55:10 -0400 |
commit | e1b158abc532f5a9d355c187583038c4f75ab11d (patch) | |
tree | 044577ee0b160950c7e8d61eb25a66593b96daf6 /drivers/mtd/chips | |
parent | ec2d0d842577854eee18f0dc06bd48fe17189b54 (diff) |
mtd: CFI 1.0 and CFI 1.1
This patch allows otpinfo for CFI >= 1.0 and burst read for CFI >= 1.1.
references:
1.0: http://www.datasheetcatalog.org/datasheets2/81/816884_1.pdf
1.1: http://milkymist.org/doc/MT28F640J3.pdf
http://www.delorie.com/agenda/specs/29066709.pdf
Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/chips')
-rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index e772803b4959..8664feebc93b 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
@@ -329,6 +329,7 @@ read_pri_intelext(struct map_info *map, __u16 adr) | |||
329 | { | 329 | { |
330 | struct cfi_private *cfi = map->fldrv_priv; | 330 | struct cfi_private *cfi = map->fldrv_priv; |
331 | struct cfi_pri_intelext *extp; | 331 | struct cfi_pri_intelext *extp; |
332 | unsigned int extra_size = 0; | ||
332 | unsigned int extp_size = sizeof(*extp); | 333 | unsigned int extp_size = sizeof(*extp); |
333 | 334 | ||
334 | again: | 335 | again: |
@@ -352,19 +353,24 @@ read_pri_intelext(struct map_info *map, __u16 adr) | |||
352 | extp->BlkStatusRegMask = le16_to_cpu(extp->BlkStatusRegMask); | 353 | extp->BlkStatusRegMask = le16_to_cpu(extp->BlkStatusRegMask); |
353 | extp->ProtRegAddr = le16_to_cpu(extp->ProtRegAddr); | 354 | extp->ProtRegAddr = le16_to_cpu(extp->ProtRegAddr); |
354 | 355 | ||
355 | if (extp->MajorVersion == '1' && extp->MinorVersion >= '3') { | 356 | if (extp->MinorVersion >= '0') { |
356 | unsigned int extra_size = 0; | 357 | extra_size = 0; |
357 | int nb_parts, i; | ||
358 | 358 | ||
359 | /* Protection Register info */ | 359 | /* Protection Register info */ |
360 | extra_size += (extp->NumProtectionFields - 1) * | 360 | extra_size += (extp->NumProtectionFields - 1) * |
361 | sizeof(struct cfi_intelext_otpinfo); | 361 | sizeof(struct cfi_intelext_otpinfo); |
362 | } | ||
362 | 363 | ||
364 | if (extp->MinorVersion >= '1') { | ||
363 | /* Burst Read info */ | 365 | /* Burst Read info */ |
364 | extra_size += 2; | 366 | extra_size += 2; |
365 | if (extp_size < sizeof(*extp) + extra_size) | 367 | if (extp_size < sizeof(*extp) + extra_size) |
366 | goto need_more; | 368 | goto need_more; |
367 | extra_size += extp->extra[extra_size-1]; | 369 | extra_size += extp->extra[extra_size - 1]; |
370 | } | ||
371 | |||
372 | if (extp->MinorVersion >= '3') { | ||
373 | int nb_parts, i; | ||
368 | 374 | ||
369 | /* Number of hardware-partitions */ | 375 | /* Number of hardware-partitions */ |
370 | extra_size += 1; | 376 | extra_size += 1; |