]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/mtd/chips/jedec_probe.c
[MTD] JEDEC probe: kill some inline bloat
[linux-2.6-omap-h63xx.git] / drivers / mtd / chips / jedec_probe.c
index 1154dac715aa62b6f89eea9337809ad14b38d7a5..4204bb23a1751a385a5701de68eb10d458c0592e 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/init.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
@@ -70,6 +69,7 @@
 
 /* Fujitsu */
 #define MBM29F040C     0x00A4
+#define MBM29F800BA    0x2258
 #define MBM29LV650UE   0x22D7
 #define MBM29LV320TE   0x22F6
 #define MBM29LV320BE   0x22F9
 #define LH28F640BF     0x00b0
 
 /* ST - www.st.com */
+#define M29F800AB      0x0058
 #define M29W800DT      0x00D7
 #define M29W800DB      0x005B
 #define M29W160DT      0x22C4
 #define SST39SF010A    0x00B5
 #define SST39SF020A    0x00B6
 #define SST49LF004B    0x0060
+#define SST49LF040B    0x0050
 #define SST49LF008A    0x005a
 #define SST49LF030A    0x001C
 #define SST49LF040A    0x0051
@@ -192,8 +194,8 @@ enum uaddr {
 
 
 struct unlock_addr {
-       u32 addr1;
-       u32 addr2;
+       uint32_t addr1;
+       uint32_t addr2;
 };
 
 
@@ -244,16 +246,16 @@ static const struct unlock_addr  unlock_addrs[] = {
        }
 };
 
-
 struct amd_flash_info {
-       const __u16 mfr_id;
-       const __u16 dev_id;
        const char *name;
-       const int DevSize;
-       const int NumEraseRegions;
-       const int CmdSet;
-       const __u8 uaddr[4];            /* unlock addrs for 8, 16, 32, 64 */
-       const ulong regions[6];
+       const uint16_t mfr_id;
+       const uint16_t dev_id;
+       const uint8_t dev_size;
+       const uint8_t nr_regions;
+       const uint16_t cmd_set;
+       const uint32_t regions[6];
+       const uint8_t devtypes;         /* Bitmask for x8, x16 etc. */
+       const uint8_t uaddr;            /* unlock addrs for 8, 16, 32, 64 */
 };
 
 #define ERASEINFO(size,blocks) (size<<8)|(blocks-1)
@@ -278,12 +280,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F032B,
                .name           = "AMD AM29F032B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,64)
                }
@@ -291,13 +292,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV160DT,
                .name           = "AMD AM29LV160DT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA   /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,31),
                        ERASEINFO(0x08000,1),
@@ -308,13 +307,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV160DB,
                .name           = "AMD AM29LV160DB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA   /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -325,13 +322,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV400BB,
                .name           = "AMD AM29LV400BB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .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),
@@ -342,13 +337,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV400BT,
                .name           = "AMD AM29LV400BT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .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),
@@ -359,13 +352,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV800BB,
                .name           = "AMD AM29LV800BB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -377,13 +368,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29DL800BB,
                .name           = "AMD AM29DL800BB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 6,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 6,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x08000,1),
@@ -396,13 +385,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29DL800BT,
                .name           = "AMD AM29DL800BT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 6,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 6,
                .regions        = {
                        ERASEINFO(0x10000,14),
                        ERASEINFO(0x04000,1),
@@ -415,13 +402,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F800BB,
                .name           = "AMD AM29F800BB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -432,13 +417,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV800BT,
                .name           = "AMD AM29LV800BT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,15),
                        ERASEINFO(0x08000,1),
@@ -449,13 +432,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F800BT,
                .name           = "AMD AM29F800BT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,15),
                        ERASEINFO(0x08000,1),
@@ -466,12 +447,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F017D,
                .name           = "AMD AM29F017D",
-               .uaddr          = {
-                       [0] = MTD_UADDR_DONT_CARE     /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_DONT_CARE,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,32),
                }
@@ -479,12 +459,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F016D,
                .name           = "AMD AM29F016D",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,32),
                }
@@ -492,12 +471,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F080,
                .name           = "AMD AM29F080",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,16),
                }
@@ -505,12 +483,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F040,
                .name           = "AMD AM29F040",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -518,12 +495,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29LV040B,
                .name           = "AMD AM29LV040B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -531,12 +507,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_AMD,
                .dev_id         = AM29F002T,
                .name           = "AMD AM29F002T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,3),
                        ERASEINFO(0x08000,1),
@@ -547,12 +522,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ATMEL,
                .dev_id         = AT49BV512,
                .name           = "Atmel AT49BV512",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_64KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_64KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,1)
                }
@@ -560,12 +534,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ATMEL,
                .dev_id         = AT29LV512,
                .name           = "Atmel AT29LV512",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_64KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_64KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x80,256),
                        ERASEINFO(0x80,256)
@@ -574,13 +547,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ATMEL,
                .dev_id         = AT49BV16X,
                .name           = "Atmel AT49BV16X",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x0AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x0AAA   /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x0AAA,      /* ???? */
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000,8),
                        ERASEINFO(0x10000,31)
@@ -589,13 +560,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ATMEL,
                .dev_id         = AT49BV16XT,
                .name           = "Atmel AT49BV16XT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x0AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x0AAA   /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x0AAA,      /* ???? */
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000,31),
                        ERASEINFO(0x02000,8)
@@ -604,13 +573,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ATMEL,
                .dev_id         = AT49BV32X,
                .name           = "Atmel AT49BV32X",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x0AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x0AAA   /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x0AAA,      /* ???? */
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000,8),
                        ERASEINFO(0x10000,63)
@@ -619,13 +586,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ATMEL,
                .dev_id         = AT49BV32XT,
                .name           = "Atmel AT49BV32XT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x0AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x0AAA   /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x0AAA,      /* ???? */
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000,63),
                        ERASEINFO(0x02000,8)
@@ -634,25 +599,38 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29F040C,
                .name           = "Fujitsu MBM29F040C",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8)
                }
+       }, {
+               .mfr_id         = MANUFACTURER_FUJITSU,
+               .dev_id         = MBM29F800BA,
+               .name           = "Fujitsu MBM29F800BA",
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
+               .regions        = {
+                       ERASEINFO(0x04000,1),
+                       ERASEINFO(0x02000,2),
+                       ERASEINFO(0x08000,1),
+                       ERASEINFO(0x10000,15),
+               }
        }, {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV650UE,
                .name           = "Fujitsu MBM29LV650UE",
-               .uaddr          = {
-                       [0] = MTD_UADDR_DONT_CARE     /* x16 */
-               },
-               .DevSize        = SIZE_8MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_DONT_CARE,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,128)
                }
@@ -660,13 +638,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV320TE,
                .name           = "Fujitsu MBM29LV320TE",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000,63),
                        ERASEINFO(0x02000,8)
@@ -675,13 +651,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV320BE,
                .name           = "Fujitsu MBM29LV320BE",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000,8),
                        ERASEINFO(0x10000,63)
@@ -690,13 +664,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV160TE,
                .name           = "Fujitsu MBM29LV160TE",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,31),
                        ERASEINFO(0x08000,1),
@@ -707,13 +679,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV160BE,
                .name           = "Fujitsu MBM29LV160BE",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -724,13 +694,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV800BA,
                .name           = "Fujitsu MBM29LV800BA",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -741,13 +709,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV800TA,
                .name           = "Fujitsu MBM29LV800TA",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,15),
                        ERASEINFO(0x08000,1),
@@ -758,13 +724,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV400BC,
                .name           = "Fujitsu MBM29LV400BC",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .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),
@@ -775,13 +739,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_FUJITSU,
                .dev_id         = MBM29LV400TC,
                .name           = "Fujitsu MBM29LV400TC",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .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),
@@ -792,12 +754,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_HYUNDAI,
                .dev_id         = HY29F002T,
                .name           = "Hyundai HY29F002T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,3),
                        ERASEINFO(0x08000,1),
@@ -808,12 +769,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F004B3B,
                .name           = "Intel 28F004B3B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 7),
@@ -822,12 +782,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F004B3T,
                .name           = "Intel 28F004B3T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 7),
                        ERASEINFO(0x02000, 8),
@@ -836,13 +795,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F400B3B,
                .name           = "Intel 28F400B3B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 7),
@@ -851,13 +808,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F400B3T,
                .name           = "Intel 28F400B3T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 7),
                        ERASEINFO(0x02000, 8),
@@ -866,12 +821,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F008B3B,
                .name           = "Intel 28F008B3B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 15),
@@ -880,12 +834,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F008B3T,
                .name           = "Intel 28F008B3T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 15),
                        ERASEINFO(0x02000, 8),
@@ -894,12 +847,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F008S5,
                .name           = "Intel 28F008S5",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,16),
                }
@@ -907,12 +859,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F016S5,
                .name           = "Intel 28F016S5",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,32),
                }
@@ -920,12 +871,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F008SA,
                .name           = "Intel 28F008SA",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000, 16),
                }
@@ -933,12 +883,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F800B3B,
                .name           = "Intel 28F800B3B",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 15),
@@ -947,12 +896,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F800B3T,
                .name           = "Intel 28F800B3T",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 15),
                        ERASEINFO(0x02000, 8),
@@ -961,12 +909,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F016B3B,
                .name           = "Intel 28F016B3B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 31),
@@ -975,12 +922,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F016S3,
                .name           = "Intel I28F016S3",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000, 32),
                }
@@ -988,12 +934,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F016B3T,
                .name           = "Intel 28F016B3T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 31),
                        ERASEINFO(0x02000, 8),
@@ -1002,12 +947,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F160B3B,
                .name           = "Intel 28F160B3B",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 31),
@@ -1016,12 +960,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F160B3T,
                .name           = "Intel 28F160B3T",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 31),
                        ERASEINFO(0x02000, 8),
@@ -1030,12 +973,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F320B3B,
                .name           = "Intel 28F320B3B",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 63),
@@ -1044,12 +986,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F320B3T,
                .name           = "Intel 28F320B3T",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 63),
                        ERASEINFO(0x02000, 8),
@@ -1058,12 +999,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F640B3B,
                .name           = "Intel 28F640B3B",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_8MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000, 8),
                        ERASEINFO(0x10000, 127),
@@ -1072,12 +1012,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I28F640B3T,
                .name           = "Intel 28F640B3T",
-               .uaddr          = {
-                       [1] = MTD_UADDR_UNNECESSARY,    /* x16 */
-               },
-               .DevSize        = SIZE_8MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000, 127),
                        ERASEINFO(0x02000, 8),
@@ -1086,12 +1025,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I82802AB,
                .name           = "Intel 82802AB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -1099,12 +1037,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_INTEL,
                .dev_id         = I82802AC,
                .name           = "Intel 82802AC",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,16),
                }
@@ -1112,12 +1049,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29LV040C,
                .name           = "Macronix MX29LV040C",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA,  /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -1125,13 +1061,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29LV160T,
                .name           = "MXIC MX29LV160T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,31),
                        ERASEINFO(0x08000,1),
@@ -1142,13 +1076,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_NEC,
                .dev_id         = UPD29F064115,
                .name           = "NEC uPD29F064115",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_8MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 3,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,      /* ???? */
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 3,
                .regions        = {
                        ERASEINFO(0x2000,8),
                        ERASEINFO(0x10000,126),
@@ -1158,13 +1090,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29LV160B,
                .name           = "MXIC MX29LV160B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -1175,12 +1105,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29F040,
                .name           = "Macronix MX29F040",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -1188,12 +1117,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29F016,
                .name           = "Macronix MX29F016",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,32),
                }
@@ -1201,12 +1129,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29F004T,
                .name           = "Macronix MX29F004T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,7),
                        ERASEINFO(0x08000,1),
@@ -1217,12 +1144,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29F004B,
                .name           = "Macronix MX29F004B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -1233,12 +1159,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_MACRONIX,
                .dev_id         = MX29F002T,
                .name           = "Macronix MX29F002T",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,3),
                        ERASEINFO(0x08000,1),
@@ -1249,12 +1174,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_PMC,
                .dev_id         = PM49FL002,
                .name           = "PMC Pm49FL002",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO( 0x01000, 64 )
                }
@@ -1262,12 +1186,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_PMC,
                .dev_id         = PM49FL004,
                .name           = "PMC Pm49FL004",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO( 0x01000, 128 )
                }
@@ -1275,12 +1198,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_PMC,
                .dev_id         = PM49FL008,
                .name           = "PMC Pm49FL008",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO( 0x01000, 256 )
                }
@@ -1288,25 +1210,23 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SHARP,
                .dev_id         = LH28F640BF,
                .name           = "LH28F640BF",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_INTEL_STD,
-               .NumEraseRegions= 1,
-               .regions        = {
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_INTEL_STD,
+               .nr_regions     = 1,
+               .regions        = {
                        ERASEINFO(0x40000,16),
                }
         }, {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST39LF512,
                .name           = "SST 39LF512",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_64KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_64KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,16),
                }
@@ -1314,12 +1234,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST39LF010,
                .name           = "SST 39LF010",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_128KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_128KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,32),
                }
@@ -1327,36 +1246,33 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST29EE020,
                .name           = "SST 29EE020",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_SST_PAGE,
-               .NumEraseRegions= 1,
-               .regions = {ERASEINFO(0x01000,64),
-               }
-         }, {
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_SST_PAGE,
+               .nr_regions     = 1,
+               .regions = {ERASEINFO(0x01000,64),
+               }
+       }, {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST29LE020,
                .name           = "SST 29LE020",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_SST_PAGE,
-               .NumEraseRegions= 1,
-               .regions = {ERASEINFO(0x01000,64),
-               }
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_SST_PAGE,
+               .nr_regions     = 1,
+               .regions = {ERASEINFO(0x01000,64),
+               }
        }, {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST39LF020,
                .name           = "SST 39LF020",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,64),
                }
@@ -1364,12 +1280,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST39LF040,
                .name           = "SST 39LF040",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,128),
                }
@@ -1377,12 +1292,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST39SF010A,
                .name           = "SST 39SF010A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_128KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_128KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,32),
                }
@@ -1390,25 +1304,36 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST39SF020A,
                .name           = "SST 39SF020A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,64),
                }
        }, {
+               .mfr_id         = MANUFACTURER_SST,
+               .dev_id         = SST49LF040B,
+               .name           = "SST 49LF040B",
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
+               .regions        = {
+                       ERASEINFO(0x01000,128),
+               }
+       }, {
+
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST49LF004B,
                .name           = "SST 49LF004B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,128),
                }
@@ -1416,12 +1341,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST49LF008A,
                .name           = "SST 49LF008A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,256),
                }
@@ -1429,12 +1353,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST49LF030A,
                .name           = "SST 49LF030A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,96),
                }
@@ -1442,12 +1365,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST49LF040A,
                .name           = "SST 49LF040A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,128),
                }
@@ -1455,57 +1377,64 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST49LF080A,
                .name           = "SST 49LF080A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x01000,256),
                }
        }, {
-               .mfr_id         = MANUFACTURER_SST,     /* should be CFI */
-               .dev_id         = SST39LF160,
-               .name           = "SST 39LF160",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x5555_0x2AAA   /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
-               .regions        = {
-                       ERASEINFO(0x1000,256),
-                       ERASEINFO(0x1000,256)
-               }
-       }, {
-               .mfr_id         = MANUFACTURER_SST,     /* should be CFI */
-               .dev_id         = SST39VF1601,
-               .name           = "SST 39VF1601",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x5555_0x2AAA   /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
-               .regions        = {
-                       ERASEINFO(0x1000,256),
-                       ERASEINFO(0x1000,256)
-               }
-
+               .mfr_id         = MANUFACTURER_SST,     /* should be CFI */
+               .dev_id         = SST39LF160,
+               .name           = "SST 39LF160",
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,      /* ???? */
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
+               .regions        = {
+                       ERASEINFO(0x1000,256),
+                       ERASEINFO(0x1000,256)
+               }
+       }, {
+               .mfr_id         = MANUFACTURER_SST,     /* should be CFI */
+               .dev_id         = SST39VF1601,
+               .name           = "SST 39VF1601",
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,      /* ???? */
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
+               .regions        = {
+                       ERASEINFO(0x1000,256),
+                       ERASEINFO(0x1000,256)
+               }
+       }, {
+               .mfr_id         = MANUFACTURER_ST,
+               .dev_id         = M29F800AB,
+               .name           = "ST M29F800AB",
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
+               .regions        = {
+                       ERASEINFO(0x04000,1),
+                       ERASEINFO(0x02000,2),
+                       ERASEINFO(0x08000,1),
+                       ERASEINFO(0x10000,15),
+               }
        }, {
                .mfr_id         = MANUFACTURER_ST,      /* FIXME - CFI device? */
                .dev_id         = M29W800DT,
                .name           = "ST M29W800DT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x5555_0x2AAA   /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,      /* ???? */
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,15),
                        ERASEINFO(0x08000,1),
@@ -1516,13 +1445,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,      /* FIXME - CFI device? */
                .dev_id         = M29W800DB,
                .name           = "ST M29W800DB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA,  /* x8 */
-                       [1] = MTD_UADDR_0x5555_0x2AAA   /* x16 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,      /* ???? */
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -1533,13 +1460,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,      /* FIXME - CFI device? */
                .dev_id         = M29W160DT,
                .name           = "ST M29W160DT",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,      /* ???? */
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,31),
                        ERASEINFO(0x08000,1),
@@ -1550,13 +1475,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,      /* FIXME - CFI device? */
                .dev_id         = M29W160DB,
                .name           = "ST M29W160DB",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA,  /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA,  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,      /* ???? */
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -1567,12 +1490,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,
                .dev_id         = M29W040B,
                .name           = "ST M29W040B",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0555_0x02AA /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0555_0x02AA,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -1580,12 +1502,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,
                .dev_id         = M50FW040,
                .name           = "ST M50FW040",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_512KiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_512KiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,8),
                }
@@ -1593,12 +1514,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,
                .dev_id         = M50FW080,
                .name           = "ST M50FW080",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,16),
                }
@@ -1606,12 +1526,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,
                .dev_id         = M50FW016,
                .name           = "ST M50FW016",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,32),
                }
@@ -1619,12 +1538,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_ST,
                .dev_id         = M50LPW080,
                .name           = "ST M50LPW080",
-               .uaddr          = {
-                       [0] = MTD_UADDR_UNNECESSARY,    /* x8 */
-               },
-               .DevSize        = SIZE_1MiB,
-               .CmdSet         = P_ID_INTEL_EXT,
-               .NumEraseRegions= 1,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_UNNECESSARY,
+               .dev_size       = SIZE_1MiB,
+               .cmd_set        = P_ID_INTEL_EXT,
+               .nr_regions     = 1,
                .regions        = {
                        ERASEINFO(0x10000,16),
                }
@@ -1632,13 +1550,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVT160,
                .name           = "Toshiba TC58FVT160",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000,31),
                        ERASEINFO(0x08000,1),
@@ -1649,13 +1565,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVB160,
                .name           = "Toshiba TC58FVB160",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA  /* x16 */
-               },
-               .DevSize        = SIZE_2MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_2MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x04000,1),
                        ERASEINFO(0x02000,2),
@@ -1666,13 +1580,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVB321,
                .name           = "Toshiba TC58FVB321",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA  /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000,8),
                        ERASEINFO(0x10000,63)
@@ -1681,13 +1593,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVT321,
                .name           = "Toshiba TC58FVT321",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA  /* x16 */
-               },
-               .DevSize        = SIZE_4MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_4MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000,63),
                        ERASEINFO(0x02000,8)
@@ -1696,13 +1606,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVB641,
                .name           = "Toshiba TC58FVB641",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA, /* x16 */
-               },
-               .DevSize        = SIZE_8MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x02000,8),
                        ERASEINFO(0x10000,127)
@@ -1711,13 +1619,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_TOSHIBA,
                .dev_id         = TC58FVT641,
                .name           = "Toshiba TC58FVT641",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x0AAA_0x0555, /* x8 */
-                       [1] = MTD_UADDR_0x0555_0x02AA, /* x16 */
-               },
-               .DevSize        = SIZE_8MiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 2,
+               .devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x0AAA_0x0555,
+               .dev_size       = SIZE_8MiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 2,
                .regions        = {
                        ERASEINFO(0x10000,127),
                        ERASEINFO(0x02000,8)
@@ -1726,12 +1632,11 @@ static const struct amd_flash_info jedec_table[] = {
                .mfr_id         = MANUFACTURER_WINBOND,
                .dev_id         = W49V002A,
                .name           = "Winbond W49V002A",
-               .uaddr          = {
-                       [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
-               },
-               .DevSize        = SIZE_256KiB,
-               .CmdSet         = P_ID_AMD_STD,
-               .NumEraseRegions= 4,
+               .devtypes       = CFI_DEVICETYPE_X8,
+               .uaddr          = MTD_UADDR_0x5555_0x2AAA,
+               .dev_size       = SIZE_256KiB,
+               .cmd_set        = P_ID_AMD_STD,
+               .nr_regions     = 4,
                .regions        = {
                        ERASEINFO(0x10000, 3),
                        ERASEINFO(0x08000, 1),
@@ -1744,12 +1649,12 @@ static const struct amd_flash_info jedec_table[] = {
 
 static int cfi_jedec_setup(struct cfi_private *p_cfi, int index);
 
-static int jedec_probe_chip(struct map_info *map, __u32 base,
+static int jedec_probe_chip(struct map_info *map, uint32_t base,
                            unsigned long *chip_map, struct cfi_private *cfi);
 
 static struct mtd_info *jedec_probe(struct map_info *map);
 
-static inline u32 jedec_read_mfr(struct map_info *map, __u32 base,
+static inline u32 jedec_read_mfr(struct map_info *map, uint32_t base,
        struct cfi_private *cfi)
 {
        map_word result;
@@ -1760,7 +1665,7 @@ static inline u32 jedec_read_mfr(struct map_info *map, __u32 base,
        return result.x[0] & mask;
 }
 
-static inline u32 jedec_read_id(struct map_info *map, __u32 base,
+static inline u32 jedec_read_id(struct map_info *map, uint32_t base,
        struct cfi_private *cfi)
 {
        map_word result;
@@ -1771,8 +1676,7 @@ static inline u32 jedec_read_id(struct map_info *map, __u32 base,
        return result.x[0] & mask;
 }
 
-static inline void jedec_reset(u32 base, struct map_info *map,
-       struct cfi_private *cfi)
+static void jedec_reset(u32 base, struct map_info *map, struct cfi_private *cfi)
 {
        /* Reset */
 
@@ -1782,7 +1686,7 @@ static inline void jedec_reset(u32 base, struct map_info *map,
         * 0x2aaa, 0xF0 at 0x5555 this will not affect the AMD chips
         * as they will ignore the writes and dont care what address
         * the F0 is written to */
-       if(cfi->addr_unlock1) {
+       if (cfi->addr_unlock1) {
                DEBUG( MTD_DEBUG_LEVEL3,
                       "reset unlock called %x %x \n",
                       cfi->addr_unlock1,cfi->addr_unlock2);
@@ -1791,7 +1695,7 @@ static inline void jedec_reset(u32 base, struct map_info *map,
        }
 
        cfi_send_gen_cmd(0xF0, cfi->addr_unlock1, base, map, cfi, cfi->device_type, NULL);
-       /* Some misdesigned intel chips do not respond for 0xF0 for a reset,
+       /* Some misdesigned Intel chips do not respond for 0xF0 for a reset,
         * so ensure we're in read mode.  Send both the Intel and the AMD command
         * for this.  Intel uses 0xff for this, AMD uses 0xff for NOP, so
         * this should be safe.
@@ -1801,42 +1705,20 @@ static inline void jedec_reset(u32 base, struct map_info *map,
 }
 
 
-static inline __u8 finfo_uaddr(const struct amd_flash_info *finfo, int device_type)
-{
-       int uaddr_idx;
-       __u8 uaddr = MTD_UADDR_NOT_SUPPORTED;
-
-       switch ( device_type ) {
-       case CFI_DEVICETYPE_X8:  uaddr_idx = 0; break;
-       case CFI_DEVICETYPE_X16: uaddr_idx = 1; break;
-       case CFI_DEVICETYPE_X32: uaddr_idx = 2; break;
-       default:
-               printk(KERN_NOTICE "MTD: %s(): unknown device_type %d\n",
-                      __func__, device_type);
-               goto uaddr_done;
-       }
-
-       uaddr = finfo->uaddr[uaddr_idx];
-
-       if (uaddr != MTD_UADDR_NOT_SUPPORTED ) {
-               /* ASSERT("The unlock addresses for non-8-bit mode
-                  are bollocks. We don't really need an array."); */
-               uaddr = finfo->uaddr[0];
-       }
-
- uaddr_done:
-       return uaddr;
-}
-
-
 static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
 {
        int i,num_erase_regions;
-       __u8 uaddr;
+       uint8_t uaddr;
+
+       if (! (jedec_table[index].devtypes & p_cfi->device_type)) {
+               DEBUG(MTD_DEBUG_LEVEL1, "Rejecting potential %s with incompatible %d-bit device type\n",
+                     jedec_table[index].name, 4 * (1<<p_cfi->device_type));
+               return 0;
+       }
 
-       printk("Found: %s\n",jedec_table[index].name);
+       printk(KERN_INFO "Found: %s\n",jedec_table[index].name);
 
-       num_erase_regions = jedec_table[index].NumEraseRegions;
+       num_erase_regions = jedec_table[index].nr_regions;
 
        p_cfi->cfiq = kmalloc(sizeof(struct cfi_ident) + num_erase_regions * 4, GFP_KERNEL);
        if (!p_cfi->cfiq) {
@@ -1846,9 +1728,9 @@ static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
 
        memset(p_cfi->cfiq,0,sizeof(struct cfi_ident));
 
-       p_cfi->cfiq->P_ID = jedec_table[index].CmdSet;
-       p_cfi->cfiq->NumEraseRegions = jedec_table[index].NumEraseRegions;
-       p_cfi->cfiq->DevSize = jedec_table[index].DevSize;
+       p_cfi->cfiq->P_ID = jedec_table[index].cmd_set;
+       p_cfi->cfiq->NumEraseRegions = jedec_table[index].nr_regions;
+       p_cfi->cfiq->DevSize = jedec_table[index].dev_size;
        p_cfi->cfi_mode = CFI_MODE_JEDEC;
 
        for (i=0; i<num_erase_regions; i++){
@@ -1860,34 +1742,34 @@ static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
        p_cfi->mfr = jedec_table[index].mfr_id;
        p_cfi->id = jedec_table[index].dev_id;
 
-       uaddr = finfo_uaddr(&jedec_table[index], p_cfi->device_type);
-       if ( uaddr == MTD_UADDR_NOT_SUPPORTED ) {
-               kfree( p_cfi->cfiq );
-               return 0;
-       }
+       uaddr = jedec_table[index].uaddr;
 
-       p_cfi->addr_unlock1 = unlock_addrs[uaddr].addr1;
-       p_cfi->addr_unlock2 = unlock_addrs[uaddr].addr2;
+       /* The table has unlock addresses in _bytes_, and we try not to let
+          our brains explode when we see the datasheets talking about address
+          lines numbered from A-1 to A18. The CFI table has unlock addresses
+          in device-words according to the mode the device is connected in */
+       p_cfi->addr_unlock1 = unlock_addrs[uaddr].addr1 / p_cfi->device_type;
+       p_cfi->addr_unlock2 = unlock_addrs[uaddr].addr2 / p_cfi->device_type;
 
        return 1;       /* ok */
 }
 
 
 /*
- * There is a BIG problem properly ID'ing the JEDEC devic and guaranteeing
+ * There is a BIG problem properly ID'ing the JEDEC device and guaranteeing
  * the mapped address, unlock addresses, and proper chip ID.  This function
  * attempts to minimize errors.  It is doubtfull that this probe will ever
  * be perfect - consequently there should be some module parameters that
  * could be manually specified to force the chip info.
  */
-static inline int jedec_match( __u32 base,
+static inline int jedec_match( uint32_t base,
                               struct map_info *map,
                               struct cfi_private *cfi,
                               const struct amd_flash_info *finfo )
 {
        int rc = 0;           /* failure until all tests pass */
        u32 mfr, id;
-       __u8 uaddr;
+       uint8_t uaddr;
 
        /*
         * The IDs must match.  For X16 and X32 devices operating in
@@ -1900,8 +1782,8 @@ static inline int jedec_match( __u32 base,
         */
        switch (cfi->device_type) {
        case CFI_DEVICETYPE_X8:
-               mfr = (__u8)finfo->mfr_id;
-               id = (__u8)finfo->dev_id;
+               mfr = (uint8_t)finfo->mfr_id;
+               id = (uint8_t)finfo->dev_id;
 
                /* bjd: it seems that if we do this, we can end up
                 * detecting 16bit flashes as an 8bit device, even though
@@ -1914,12 +1796,12 @@ static inline int jedec_match( __u32 base,
                }
                break;
        case CFI_DEVICETYPE_X16:
-               mfr = (__u16)finfo->mfr_id;
-               id = (__u16)finfo->dev_id;
+               mfr = (uint16_t)finfo->mfr_id;
+               id = (uint16_t)finfo->dev_id;
                break;
        case CFI_DEVICETYPE_X32:
-               mfr = (__u16)finfo->mfr_id;
-               id = (__u32)finfo->dev_id;
+               mfr = (uint16_t)finfo->mfr_id;
+               id = (uint32_t)finfo->dev_id;
                break;
        default:
                printk(KERN_WARNING
@@ -1934,25 +1816,25 @@ static inline int jedec_match( __u32 base,
        /* the part size must fit in the memory window */
        DEBUG( MTD_DEBUG_LEVEL3,
               "MTD %s(): Check fit 0x%.8x + 0x%.8x = 0x%.8x\n",
-              __func__, base, 1 << finfo->DevSize, base + (1 << finfo->DevSize) );
-       if ( base + cfi_interleave(cfi) * ( 1 << finfo->DevSize ) > map->size ) {
+              __func__, base, 1 << finfo->dev_size, base + (1 << finfo->dev_size) );
+       if ( base + cfi_interleave(cfi) * ( 1 << finfo->dev_size ) > map->size ) {
                DEBUG( MTD_DEBUG_LEVEL3,
                       "MTD %s(): 0x%.4x 0x%.4x %dKiB doesn't fit\n",
                       __func__, finfo->mfr_id, finfo->dev_id,
-                      1 << finfo->DevSize );
+                      1 << finfo->dev_size );
                goto match_done;
        }
 
-       uaddr = finfo_uaddr(finfo, cfi->device_type);
-       if ( uaddr == MTD_UADDR_NOT_SUPPORTED ) {
+       if (! (finfo->devtypes & cfi->device_type))
                goto match_done;
-       }
+
+       uaddr = finfo->uaddr;
 
        DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): check unlock addrs 0x%.4x 0x%.4x\n",
               __func__, cfi->addr_unlock1, cfi->addr_unlock2 );
        if ( MTD_UADDR_UNNECESSARY != uaddr && MTD_UADDR_DONT_CARE != uaddr
-            && ( unlock_addrs[uaddr].addr1 != cfi->addr_unlock1 ||
-                 unlock_addrs[uaddr].addr2 != cfi->addr_unlock2 ) ) {
+            && ( unlock_addrs[uaddr].addr1 / cfi->device_type != cfi->addr_unlock1 ||
+                 unlock_addrs[uaddr].addr2 / cfi->device_type != cfi->addr_unlock2 ) ) {
                DEBUG( MTD_DEBUG_LEVEL3,
                        "MTD %s(): 0x%.4x 0x%.4x did not match\n",
                        __func__,
@@ -1992,7 +1874,7 @@ static inline int jedec_match( __u32 base,
         * were truly frobbing a real device.
         */
        DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): return to ID mode\n", __func__ );
-       if(cfi->addr_unlock1) {
+       if (cfi->addr_unlock1) {
                cfi_send_gen_cmd(0xaa, cfi->addr_unlock1, base, map, cfi, cfi->device_type, NULL);
                cfi_send_gen_cmd(0x55, cfi->addr_unlock2, base, map, cfi, cfi->device_type, NULL);
        }
@@ -2018,8 +1900,8 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
                if (MTD_UADDR_UNNECESSARY == uaddr_idx)
                        return 0;
 
-               cfi->addr_unlock1 = unlock_addrs[uaddr_idx].addr1;
-               cfi->addr_unlock2 = unlock_addrs[uaddr_idx].addr2;
+               cfi->addr_unlock1 = unlock_addrs[uaddr_idx].addr1 / cfi->device_type;
+               cfi->addr_unlock2 = unlock_addrs[uaddr_idx].addr2 / cfi->device_type;
        }
 
        /* Make certain we aren't probing past the end of map */
@@ -2031,19 +1913,11 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
 
        }
        /* Ensure the unlock addresses we try stay inside the map */
-       probe_offset1 = cfi_build_cmd_addr(
-               cfi->addr_unlock1,
-               cfi_interleave(cfi),
-               cfi->device_type);
-       probe_offset2 = cfi_build_cmd_addr(
-               cfi->addr_unlock1,
-               cfi_interleave(cfi),
-               cfi->device_type);
+       probe_offset1 = cfi_build_cmd_addr(cfi->addr_unlock1, cfi_interleave(cfi), cfi->device_type);
+       probe_offset2 = cfi_build_cmd_addr(cfi->addr_unlock2, cfi_interleave(cfi), cfi->device_type);
        if (    ((base + probe_offset1 + map_bankwidth(map)) >= map->size) ||
                ((base + probe_offset2 + map_bankwidth(map)) >= map->size))
-       {
                goto retry;
-       }
 
        /* Reset */
        jedec_reset(base, map, cfi);
@@ -2078,8 +1952,8 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
                }
                goto retry;
        } else {
-               __u16 mfr;
-               __u16 id;
+               uint16_t mfr;
+               uint16_t id;
 
                /* Make sure it is a chip of the same manufacturer and id */
                mfr = jedec_read_mfr(map, base, cfi);