Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5da19532 authored by Guillaume LECERF's avatar Guillaume LECERF Committed by David Woodhouse
Browse files

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: default avatarGuillaume LECERF <glecerf@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 9a9745c3

drivers/mtd/chips/cfi_cmdset_0002.c

+4 −3
Original line number Diff line number Diff line
@@ -418,12 +418,13 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
			cfi_fixup_major_minor(cfi, extp);



			/*

			 * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3

			 * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on

			 * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4

			 * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19

			 *      http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf

			 *      http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf

			 */

			if (extp->MajorVersion != '1' ||

			    (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) {

			    (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {

				printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "

				       "version %c.%c (%#02x/%#02x).\n",

				       extp->MajorVersion, extp->MinorVersion,