diff options
author | Guillaume LECERF <glecerf@gmail.com> | 2010-08-05 07:55:24 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-06 04:24:57 -0400 |
commit | 5da195326b7e220b8cf993ec830ab7251d4cc1d0 (patch) | |
tree | 7158ee91f9b5cd6edac28ad02e4b7969a55d4c71 /drivers/mtd | |
parent | 9a9745c363277cc4e3a1d3e77b4814fbc2685a73 (diff) |
mtd: cfi_cmdset_0002: consider version 1.4 as a valid primary extension version
The Spansion S29WS-P device family uses CFI version 1.4 [1].
Consider it as a valid version.
[1] http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf
Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 749203f89b55..bd20d1ff1b0d 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c | |||
@@ -418,12 +418,13 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) | |||
418 | cfi_fixup_major_minor(cfi, extp); | 418 | cfi_fixup_major_minor(cfi, extp); |
419 | 419 | ||
420 | /* | 420 | /* |
421 | * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3 | 421 | * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 |
422 | * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on | 422 | * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 |
423 | * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf | 423 | * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf |
424 | * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf | ||
424 | */ | 425 | */ |
425 | if (extp->MajorVersion != '1' || | 426 | if (extp->MajorVersion != '1' || |
426 | (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) { | 427 | (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) { |
427 | printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " | 428 | printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " |
428 | "version %c.%c (%#02x/%#02x).\n", | 429 | "version %c.%c (%#02x/%#02x).\n", |
429 | extp->MajorVersion, extp->MinorVersion, | 430 | extp->MajorVersion, extp->MinorVersion, |