Merge tag 'mtd/for-4.17' of git://git.infradead.org/linux-mtd

[sfrench/cifs-2.6.git] / drivers / mtd / chips / jedec_probe.c

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index b479bd81120b3432e015b76496c3f3ea1d32580c..6f7e7e1b3fe5fc69ac9e868d2fdc84e135a717ce 100644 (file)
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -53,6 +53,8 @@
 #define AT49BV32XT     0x00C9
 
 /* Eon */
+#define EN29LV400AT    0x22B9
+#define EN29LV400AB    0x22BA
 #define EN29SL800BB    0x226B
 #define EN29SL800BT    0x22EA
 
@@ -641,6 +643,36 @@ static const struct amd_flash_info jedec_table[] = {
                        ERASEINFO(0x10000,63),
                        ERASEINFO(0x02000,8)
                }
+       }, {
+               .mfr_id         = CFI_MFR_EON,
+               .dev_id         = EN29LV400AT,
+               .name           = "Eon EN29LV400AT",
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
+               .regions        = {
+                       ERASEINFO(0x10000,7),
+                       ERASEINFO(0x08000,1),
+                       ERASEINFO(0x02000,2),
+                       ERASEINFO(0x04000,1),
+               }
+       }, {
+               .mfr_id         = CFI_MFR_EON,
+               .dev_id         = EN29LV400AB,
+               .name           = "Eon EN29LV400AB",
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
+               .regions        = {
+                       ERASEINFO(0x04000,1),
+                       ERASEINFO(0x02000,2),
+                       ERASEINFO(0x08000,1),
+                       ERASEINFO(0x10000,7),
+               }
        }, {
                .mfr_id         = CFI_MFR_EON,
                .dev_id         = EN29SL800BT,