Commit fefae48b authored by Wolfgang Grandegger's avatar Wolfgang Grandegger Committed by David Woodhouse
Browse files

[MTD] CFI: remove major/minor version check for command set 0x0002 



The NOR Flash memory K8P2815UQB from Samsung uses the major version
number '0'. Add a quirk to cope with it.

Signed-off-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent a808ad3b

drivers/mtd/chips/cfi_cmdset_0002.c

+10 −0
Original line number Diff line number Diff line
@@ -322,6 +322,14 @@ static struct cfi_fixup fixup_table[] = { 
};





static void cfi_fixup_major_minor(struct cfi_private *cfi,

				  struct cfi_pri_amdstd *extp)

{

	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&

	    extp->MajorVersion == '0')

		extp->MajorVersion = '1';

}



struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)

{

	struct cfi_private *cfi = map->fldrv_priv;
@@ -363,6 +371,8 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
			return NULL;

		}



		cfi_fixup_major_minor(cfi, extp);



		if (extp->MajorVersion != '1' ||

		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "

include/linux/mtd/cfi.h

+1 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ struct cfi_fixup { 


#define CFI_MFR_AMD 0x0001

#define CFI_MFR_ATMEL 0x001F

#define CFI_MFR_SAMSUNG 0x00EC

#define CFI_MFR_ST  0x0020 	/* STMicroelectronics */



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