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@spansion.com>
Acked-by: Guillaume LECERF <glecerf@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 0b49266840b94407eb53ba0aad9b17ad531f0997..b890f6c964d9c32007136a704dbe42538ee39aec 100644 (file)
--- 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,