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

Commit ae731822 authored by Wolfram Sang's avatar Wolfram Sang Committed by David Woodhouse
Browse files

mtd: chips: use common manufacturer codes in jedec_probe() 



Factor out old manufacturers and use the generic ones from cfi.h

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 087444da

drivers/mtd/chips/jedec_probe.c

+117 −135
Original line number Diff line number Diff line
@@ -22,24 +22,6 @@ 
#include <linux/mtd/cfi.h>

#include <linux/mtd/gen_probe.h>



/* Manufacturers */

#define MANUFACTURER_AMD	0x0001

#define MANUFACTURER_ATMEL	0x001f

#define MANUFACTURER_EON	0x001c

#define MANUFACTURER_FUJITSU	0x0004

#define MANUFACTURER_HYUNDAI	0x00AD

#define MANUFACTURER_INTEL	0x0089

#define MANUFACTURER_MACRONIX	0x00C2

#define MANUFACTURER_NEC	0x0010

#define MANUFACTURER_PMC	0x009D

#define MANUFACTURER_SHARP	0x00b0

#define MANUFACTURER_SST	0x00BF

#define MANUFACTURER_ST		0x0020

#define MANUFACTURER_TOSHIBA	0x0098

#define MANUFACTURER_WINBOND	0x00da

#define CONTINUATION_CODE	0x007f





/* AMD */

#define AM29DL800BB	0x22CB

#define AM29DL800BT	0x224A
@@ -309,7 +291,7 @@ struct amd_flash_info { 
 */

static const struct amd_flash_info jedec_table[] = {

	{

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F032B,

		.name		= "AMD AM29F032B",

		.uaddr		= MTD_UADDR_0x0555_0x02AA,
@@ -321,7 +303,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,64)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV160DT,

		.name		= "AMD AM29LV160DT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -336,7 +318,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV160DB,

		.name		= "AMD AM29LV160DB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -351,7 +333,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,31)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV400BB,

		.name		= "AMD AM29LV400BB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -366,7 +348,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,7)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV400BT,

		.name		= "AMD AM29LV400BT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -381,7 +363,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV800BB,

		.name		= "AMD AM29LV800BB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -397,7 +379,7 @@ static const struct amd_flash_info jedec_table[] = { 
		}

	}, {

/* add DL */

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29DL800BB,

		.name		= "AMD AM29DL800BB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -414,7 +396,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,14)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29DL800BT,

		.name		= "AMD AM29DL800BT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -431,7 +413,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F800BB,

		.name		= "AMD AM29F800BB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -446,7 +428,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV800BT,

		.name		= "AMD AM29LV800BT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -461,7 +443,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F800BT,

		.name		= "AMD AM29F800BT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -476,7 +458,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F017D,

		.name		= "AMD AM29F017D",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -488,7 +470,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F016D,

		.name		= "AMD AM29F016D",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -500,7 +482,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F080,

		.name		= "AMD AM29F080",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -512,7 +494,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F040,

		.name		= "AMD AM29F040",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -524,7 +506,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29LV040B,

		.name		= "AMD AM29LV040B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -536,7 +518,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29F002T,

		.name		= "AMD AM29F002T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -551,7 +533,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29SL800DT,

		.name		= "AMD AM29SL800DT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -566,7 +548,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1),

		}

	}, {

		.mfr_id		= MANUFACTURER_AMD,

		.mfr_id		= CFI_MFR_AMD,

		.dev_id		= AM29SL800DB,

		.name		= "AMD AM29SL800DB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -581,7 +563,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15),

		}

	}, {

		.mfr_id		= MANUFACTURER_ATMEL,

		.mfr_id		= CFI_MFR_ATMEL,

		.dev_id		= AT49BV512,

		.name		= "Atmel AT49BV512",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -593,7 +575,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_ATMEL,

		.mfr_id		= CFI_MFR_ATMEL,

		.dev_id		= AT29LV512,

		.name		= "Atmel AT29LV512",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -606,7 +588,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x80,256)

		}

	}, {

		.mfr_id		= MANUFACTURER_ATMEL,

		.mfr_id		= CFI_MFR_ATMEL,

		.dev_id		= AT49BV16X,

		.name		= "Atmel AT49BV16X",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -619,7 +601,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,31)

		}

	}, {

		.mfr_id		= MANUFACTURER_ATMEL,

		.mfr_id		= CFI_MFR_ATMEL,

		.dev_id		= AT49BV16XT,

		.name		= "Atmel AT49BV16XT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -632,7 +614,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000,8)

		}

	}, {

		.mfr_id		= MANUFACTURER_ATMEL,

		.mfr_id		= CFI_MFR_ATMEL,

		.dev_id		= AT49BV32X,

		.name		= "Atmel AT49BV32X",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -645,7 +627,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,63)

		}

	}, {

		.mfr_id		= MANUFACTURER_ATMEL,

		.mfr_id		= CFI_MFR_ATMEL,

		.dev_id		= AT49BV32XT,

		.name		= "Atmel AT49BV32XT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -658,7 +640,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000,8)

		}

	}, {

		.mfr_id		= MANUFACTURER_EON,

		.mfr_id		= CFI_MFR_EON,

		.dev_id		= EN29SL800BT,

		.name		= "Eon EN29SL800BT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -673,7 +655,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1),

		}

	}, {

		.mfr_id		= MANUFACTURER_EON,

		.mfr_id		= CFI_MFR_EON,

		.dev_id		= EN29SL800BB,

		.name		= "Eon EN29SL800BB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -688,7 +670,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15),

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29F040C,

		.name		= "Fujitsu MBM29F040C",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -700,7 +682,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29F800BA,

		.name		= "Fujitsu MBM29F800BA",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -715,7 +697,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15),

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV650UE,

		.name		= "Fujitsu MBM29LV650UE",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -727,7 +709,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,128)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV320TE,

		.name		= "Fujitsu MBM29LV320TE",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -740,7 +722,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000,8)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV320BE,

		.name		= "Fujitsu MBM29LV320BE",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -753,7 +735,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,63)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV160TE,

		.name		= "Fujitsu MBM29LV160TE",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -768,7 +750,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV160BE,

		.name		= "Fujitsu MBM29LV160BE",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -783,7 +765,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,31)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV800BA,

		.name		= "Fujitsu MBM29LV800BA",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -798,7 +780,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV800TA,

		.name		= "Fujitsu MBM29LV800TA",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -813,7 +795,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV400BC,

		.name		= "Fujitsu MBM29LV400BC",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -828,7 +810,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,7)

		}

	}, {

		.mfr_id		= MANUFACTURER_FUJITSU,

		.mfr_id		= CFI_MFR_FUJITSU,

		.dev_id		= MBM29LV400TC,

		.name		= "Fujitsu MBM29LV400TC",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -843,7 +825,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_HYUNDAI,

		.mfr_id		= CFI_MFR_HYUNDAI,

		.dev_id		= HY29F002T,

		.name		= "Hyundai HY29F002T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -858,7 +840,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F004B3B,

		.name		= "Intel 28F004B3B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -871,7 +853,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 7),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F004B3T,

		.name		= "Intel 28F004B3T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -884,7 +866,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F400B3B,

		.name		= "Intel 28F400B3B",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -897,7 +879,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 7),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F400B3T,

		.name		= "Intel 28F400B3T",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -910,7 +892,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F008B3B,

		.name		= "Intel 28F008B3B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -923,7 +905,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 15),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F008B3T,

		.name		= "Intel 28F008B3T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -936,7 +918,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F008S5,

		.name		= "Intel 28F008S5",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -948,7 +930,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F016S5,

		.name		= "Intel 28F016S5",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -960,7 +942,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F008SA,

		.name		= "Intel 28F008SA",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -972,7 +954,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 16),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F800B3B,

		.name		= "Intel 28F800B3B",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -985,7 +967,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 15),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F800B3T,

		.name		= "Intel 28F800B3T",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -998,7 +980,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F016B3B,

		.name		= "Intel 28F016B3B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1011,7 +993,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 31),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F016S3,

		.name		= "Intel I28F016S3",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1023,7 +1005,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 32),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F016B3T,

		.name		= "Intel 28F016B3T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1036,7 +1018,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F160B3B,

		.name		= "Intel 28F160B3B",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1049,7 +1031,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 31),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F160B3T,

		.name		= "Intel 28F160B3T",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1062,7 +1044,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F320B3B,

		.name		= "Intel 28F320B3B",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1075,7 +1057,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 63),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F320B3T,

		.name		= "Intel 28F320B3T",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1088,7 +1070,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F640B3B,

		.name		= "Intel 28F640B3B",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1101,7 +1083,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 127),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F640B3T,

		.name		= "Intel 28F640B3T",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1114,7 +1096,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000, 8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I28F640C3B,

		.name		= "Intel 28F640C3B",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1127,7 +1109,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000, 127),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I82802AB,

		.name		= "Intel 82802AB",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1139,7 +1121,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_INTEL,

		.mfr_id		= CFI_MFR_INTEL,

		.dev_id		= I82802AC,

		.name		= "Intel 82802AC",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1151,7 +1133,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29LV040C,

		.name		= "Macronix MX29LV040C",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1163,7 +1145,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29LV160T,

		.name		= "MXIC MX29LV160T",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1178,7 +1160,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_NEC,

		.mfr_id		= CFI_MFR_NEC,

		.dev_id		= UPD29F064115,

		.name		= "NEC uPD29F064115",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1192,7 +1174,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x2000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29LV160B,

		.name		= "MXIC MX29LV160B",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1207,7 +1189,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,31)

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29F040,

		.name		= "Macronix MX29F040",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1219,7 +1201,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29F016,

		.name		= "Macronix MX29F016",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1231,7 +1213,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29F004T,

		.name		= "Macronix MX29F004T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1246,7 +1228,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29F004B,

		.name		= "Macronix MX29F004B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1261,7 +1243,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,7),

		}

	}, {

		.mfr_id		= MANUFACTURER_MACRONIX,

		.mfr_id		= CFI_MFR_MACRONIX,

		.dev_id		= MX29F002T,

		.name		= "Macronix MX29F002T",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1276,7 +1258,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1),

		}

	}, {

		.mfr_id		= MANUFACTURER_PMC,

		.mfr_id		= CFI_MFR_PMC,

		.dev_id		= PM49FL002,

		.name		= "PMC Pm49FL002",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1288,7 +1270,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO( 0x01000, 64 )

		}

	}, {

		.mfr_id		= MANUFACTURER_PMC,

		.mfr_id		= CFI_MFR_PMC,

		.dev_id		= PM49FL004,

		.name		= "PMC Pm49FL004",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1300,7 +1282,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO( 0x01000, 128 )

		}

	}, {

		.mfr_id		= MANUFACTURER_PMC,

		.mfr_id		= CFI_MFR_PMC,

		.dev_id		= PM49FL008,

		.name		= "PMC Pm49FL008",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1312,7 +1294,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO( 0x01000, 256 )

		}

	}, {

		.mfr_id		= MANUFACTURER_SHARP,

		.mfr_id		= CFI_MFR_SHARP,

		.dev_id		= LH28F640BF,

		.name		= "LH28F640BF",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1324,7 +1306,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x40000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39LF512,

		.name		= "SST 39LF512",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1336,7 +1318,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39LF010,

		.name		= "SST 39LF010",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1348,7 +1330,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

 		.dev_id 	= SST29EE020,

		.name		= "SST 29EE020",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1359,7 +1341,7 @@ static const struct amd_flash_info jedec_table[] = { 
		.regions = {ERASEINFO(0x01000,64),

		}

	}, {

 		.mfr_id		= MANUFACTURER_SST,

 		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST29LE020,

 		.name		= "SST 29LE020",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1370,7 +1352,7 @@ static const struct amd_flash_info jedec_table[] = { 
		.regions = {ERASEINFO(0x01000,64),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39LF020,

		.name		= "SST 39LF020",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1382,7 +1364,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,64),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39LF040,

		.name		= "SST 39LF040",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1394,7 +1376,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,128),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39SF010A,

		.name		= "SST 39SF010A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1406,7 +1388,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39SF020A,

		.name		= "SST 39SF020A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1418,7 +1400,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,64),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST39SF040,

		.name		= "SST 39SF040",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1430,7 +1412,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,128),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST49LF040B,

		.name		= "SST 49LF040B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1443,7 +1425,7 @@ static const struct amd_flash_info jedec_table[] = { 
		}

	}, {



		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST49LF004B,

		.name		= "SST 49LF004B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1455,7 +1437,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,128),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST49LF008A,

		.name		= "SST 49LF008A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1467,7 +1449,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,256),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST49LF030A,

		.name		= "SST 49LF030A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1479,7 +1461,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,96),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST49LF040A,

		.name		= "SST 49LF040A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1491,7 +1473,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,128),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST49LF080A,

		.name		= "SST 49LF080A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1503,7 +1485,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x01000,256),

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,     /* should be CFI */

		.mfr_id		= CFI_MFR_SST,     /* should be CFI */

		.dev_id		= SST39LF160,

		.name		= "SST 39LF160",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1516,7 +1498,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x1000,256)

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,     /* should be CFI */

		.mfr_id		= CFI_MFR_SST,     /* should be CFI */

		.dev_id		= SST39VF1601,

		.name		= "SST 39VF1601",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1529,7 +1511,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x1000,256)

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,     /* should be CFI */

		.mfr_id		= CFI_MFR_SST,     /* should be CFI */

		.dev_id		= SST39VF3201,

		.name		= "SST 39VF3201",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1544,7 +1526,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x1000,256)

		}

	}, {

		.mfr_id		= MANUFACTURER_SST,

		.mfr_id		= CFI_MFR_SST,

		.dev_id		= SST36VF3203,

		.name		= "SST 36VF3203",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1556,7 +1538,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,64),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M29F800AB,

		.name		= "ST M29F800AB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1571,7 +1553,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,	/* FIXME - CFI device? */

		.mfr_id		= CFI_MFR_ST,	/* FIXME - CFI device? */

		.dev_id		= M29W800DT,

		.name		= "ST M29W800DT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1586,7 +1568,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,	/* FIXME - CFI device? */

		.mfr_id		= CFI_MFR_ST,	/* FIXME - CFI device? */

		.dev_id		= M29W800DB,

		.name		= "ST M29W800DB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1601,7 +1583,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,15)

		}

	},  {

		.mfr_id         = MANUFACTURER_ST,

		.mfr_id         = CFI_MFR_ST,

		.dev_id         = M29W400DT,

		.name           = "ST M29W400DT",

		.devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1616,7 +1598,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,1)

		}

	}, {

		.mfr_id         = MANUFACTURER_ST,

		.mfr_id         = CFI_MFR_ST,

		.dev_id         = M29W400DB,

		.name           = "ST M29W400DB",

		.devtypes       = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1631,7 +1613,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,7)

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,	/* FIXME - CFI device? */

		.mfr_id		= CFI_MFR_ST,	/* FIXME - CFI device? */

		.dev_id		= M29W160DT,

		.name		= "ST M29W160DT",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1646,7 +1628,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,	/* FIXME - CFI device? */

		.mfr_id		= CFI_MFR_ST,	/* FIXME - CFI device? */

		.dev_id		= M29W160DB,

		.name		= "ST M29W160DB",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1661,7 +1643,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,31)

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M29W040B,

		.name		= "ST M29W040B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1673,7 +1655,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M50FW040,

		.name		= "ST M50FW040",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1685,7 +1667,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,8),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M50FW080,

		.name		= "ST M50FW080",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1697,7 +1679,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M50FW016,

		.name		= "ST M50FW016",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1709,7 +1691,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,32),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M50LPW080,

		.name		= "ST M50LPW080",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1721,7 +1703,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,16),

		},

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M50FLW080A,

		.name		= "ST M50FLW080A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1736,7 +1718,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x1000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_ST,

		.mfr_id		= CFI_MFR_ST,

		.dev_id		= M50FLW080B,

		.name		= "ST M50FLW080B",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1751,7 +1733,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x1000,16),

		}

	}, {

		.mfr_id		= 0xff00 | MANUFACTURER_ST,

		.mfr_id		= 0xff00 | CFI_MFR_ST,

		.dev_id		= 0xff00 | PSD4256G6V,

		.name		= "ST PSD4256G6V",

		.devtypes	= CFI_DEVICETYPE_X16,
@@ -1763,7 +1745,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,16),

		}

	}, {

		.mfr_id		= MANUFACTURER_TOSHIBA,

		.mfr_id		= CFI_MFR_TOSHIBA,

		.dev_id		= TC58FVT160,

		.name		= "Toshiba TC58FVT160",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1778,7 +1760,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x04000,1)

		}

	}, {

		.mfr_id		= MANUFACTURER_TOSHIBA,

		.mfr_id		= CFI_MFR_TOSHIBA,

		.dev_id		= TC58FVB160,

		.name		= "Toshiba TC58FVB160",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1793,7 +1775,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,31)

		}

	}, {

		.mfr_id		= MANUFACTURER_TOSHIBA,

		.mfr_id		= CFI_MFR_TOSHIBA,

		.dev_id		= TC58FVB321,

		.name		= "Toshiba TC58FVB321",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1806,7 +1788,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,63)

		}

	}, {

		.mfr_id		= MANUFACTURER_TOSHIBA,

		.mfr_id		= CFI_MFR_TOSHIBA,

		.dev_id		= TC58FVT321,

		.name		= "Toshiba TC58FVT321",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1819,7 +1801,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000,8)

		}

	}, {

		.mfr_id		= MANUFACTURER_TOSHIBA,

		.mfr_id		= CFI_MFR_TOSHIBA,

		.dev_id		= TC58FVB641,

		.name		= "Toshiba TC58FVB641",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1832,7 +1814,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x10000,127)

		}

	}, {

		.mfr_id		= MANUFACTURER_TOSHIBA,

		.mfr_id		= CFI_MFR_TOSHIBA,

		.dev_id		= TC58FVT641,

		.name		= "Toshiba TC58FVT641",

		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1845,7 +1827,7 @@ static const struct amd_flash_info jedec_table[] = { 
			ERASEINFO(0x02000,8)

		}

	}, {

		.mfr_id		= MANUFACTURER_WINBOND,

		.mfr_id		= CFI_MFR_WINBOND,

		.dev_id		= W49V002A,

		.name		= "Winbond W49V002A",

		.devtypes	= CFI_DEVICETYPE_X8,
@@ -1878,7 +1860,7 @@ static inline u32 jedec_read_mfr(struct map_info *map, uint32_t base, 
		mask = (1 << (cfi->device_type * 8)) - 1;

		result = map_read(map, base + ofs);

		bank++;

	} while ((result.x[0] & mask) == CONTINUATION_CODE);

	} while ((result.x[0] & mask) == CFI_MFR_CONTINUATION);



	return result.x[0] & mask;

}

include/linux/mtd/cfi.h

+11 −2
Original line number Diff line number Diff line
@@ -516,16 +516,25 @@ struct cfi_fixup { 
	void* param;

};



#define CFI_MFR_ANY 0xffff

#define CFI_ID_ANY  0xffff

#define CFI_MFR_ANY		0xFFFF

#define CFI_ID_ANY		0xFFFF

#define CFI_MFR_CONTINUATION	0x007F



#define CFI_MFR_AMD		0x0001

#define CFI_MFR_ATMEL		0x001F

#define CFI_MFR_EON		0x001C

#define CFI_MFR_FUJITSU		0x0004

#define CFI_MFR_HYUNDAI		0x00AD

#define CFI_MFR_INTEL		0x0089

#define CFI_MFR_MACRONIX	0x00C2

#define CFI_MFR_NEC		0x0010

#define CFI_MFR_PMC		0x009D

#define CFI_MFR_SAMSUNG		0x00EC

#define CFI_MFR_SHARP		0x00B0

#define CFI_MFR_SST		0x00BF

#define CFI_MFR_ST		0x0020 /* STMicroelectronics */

#define CFI_MFR_TOSHIBA		0x0098

#define CFI_MFR_WINBOND		0x00DA



void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);