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

Commit f3e69c65 authored by Guillaume LECERF's avatar Guillaume LECERF Committed by David Woodhouse
Browse files

mtd: move more manufacturers to the common cfi.h header file 



Move MANUFACTURER_MACRONIX and MANUFACTURER_SST definitions to the
include/linux/mtd/cfi.h header file and rename them to CFI_MFR_MACRONIX and
CFI_MFR_SST.

All references in drivers/mtd/chips/cfi_cmdset_0002.c are updated to reflect
this.

Signed-off-by: default avatarGuillaume LECERF <glecerf@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 66803762

drivers/mtd/chips/cfi_cmdset_0002.c

+5 −9
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ 


#define MAX_WORD_RETRIES 3



#define MANUFACTURER_AMD	0x0001

#define MANUFACTURER_ATMEL	0x001F

#define MANUFACTURER_MACRONIX	0x00C2

#define MANUFACTURER_SST	0x00BF

#define SST49LF004B	        0x0060

#define SST49LF040B	        0x0050

#define SST49LF008A		0x005a
@@ -168,7 +164,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd, void* param) 
			 * This reduces the risk of false detection due to

			 * the 8-bit device ID.

			 */

			(cfi->mfr == MANUFACTURER_MACRONIX)) {

			(cfi->mfr == CFI_MFR_MACRONIX)) {

			DEBUG(MTD_DEBUG_LEVEL1,

				"%s: Macronix MX29LV400C with bottom boot block"

				" detected\n", map->name);
@@ -286,7 +282,7 @@ static struct cfi_fixup cfi_fixup_table[] = { 
	{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },

#ifdef AMD_BOOTLOC_BUG

	{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },

	{ MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock, NULL },

	{ CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock, NULL },

#endif

	{ CFI_MFR_AMD, 0x0050, fixup_use_secsi, NULL, },

	{ CFI_MFR_AMD, 0x0053, fixup_use_secsi, NULL, },
@@ -304,9 +300,9 @@ static struct cfi_fixup cfi_fixup_table[] = { 
	{ 0, 0, NULL, NULL }

};

static struct cfi_fixup jedec_fixup_table[] = {

	{ MANUFACTURER_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },

	{ MANUFACTURER_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },

	{ MANUFACTURER_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },

	{ CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },

	{ CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },

	{ CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },

	{ 0, 0, NULL, NULL }

};

include/linux/mtd/cfi.h

+7 −5
Original line number Diff line number Diff line
@@ -519,9 +519,11 @@ struct cfi_fixup { 
#define CFI_ID_ANY  0xffff



#define CFI_MFR_AMD		0x0001

#define CFI_MFR_INTEL	0x0089

#define CFI_MFR_ATMEL		0x001F

#define CFI_MFR_INTEL		0x0089

#define CFI_MFR_MACRONIX	0x00C2

#define CFI_MFR_SAMSUNG		0x00EC

#define CFI_MFR_SST		0x00BF

#define CFI_MFR_ST		0x0020 /* STMicroelectronics */



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