mtd: cmdset_0002: add CFI 1.5 support for S29GL-S

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=c9ddab25d1b62baead4b0c5de562f1fce026dcfd
Commit:     c9ddab25d1b62baead4b0c5de562f1fce026dcfd
Parent:     99b17c08bca2810f5910b3027f1b9d82edf7a576
Author:     Gernot Hoyler <Gernot.Hoyler at spansion.com>
AuthorDate: Mon Apr 11 15:53:35 2011 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed May 25 01:51:35 2011 +0100

    mtd: cmdset_0002: add CFI 1.5 support for S29GL-S
    
    This patch adds CFI 1.5 support for the new Spansion S29GL-S device family.
    For details, see the data sheet on the Spansion web site:
    http://www.spansion.com/Support/Datasheets/S29GL_128S_01GS_00_02_e.pdf
    
    Signed-off-by: Gernot Hoyler <Gernot.Hoyler at spansion.com>
    Acked-by: Guillaume LECERF <glecerf at gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 0b49266..b890f6c 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -462,13 +462,14 @@ 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, 1.4
+			 * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5
 			 * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 
 			 *      http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
 			 *      http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf
+			 *      http://www.spansion.com/Support/Datasheets/S29GL_128S_01GS_00_02_e.pdf
 			 */
 			if (extp->MajorVersion != '1' ||
-			    (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
+			    (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '5'))) {
 				printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
 				       "version %c.%c (%#02x/%#02x).\n",
 				       extp->MajorVersion, extp->MinorVersion,