Skip to content

Commit 5da1953

Browse files
guillaumelecerfDavid Woodhouse
authored andcommitted
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>
1 parent 9a9745c commit 5da1953

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/mtd/chips/cfi_cmdset_0002.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,13 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
418418
cfi_fixup_major_minor(cfi, extp);
419419

420420
/*
421-
* Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3
422-
* see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on
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
423423
* 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
424425
*/
425426
if (extp->MajorVersion != '1' ||
426-
(extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) {
427+
(extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
427428
printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query "
428429
"version %c.%c (%#02x/%#02x).\n",
429430
extp->MajorVersion, extp->MinorVersion,

0 commit comments

Comments
 (0)