mtd: cfi: add support for AMIC flashes (e.g. A29L160AT)

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 7e9c4e9c274a46b4bbabf74c4722e4eaa9dc34ce..f9a5331e9445a3fb16e1f1604097c7a54f833201 100644 (file)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -349,6 +349,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri },
 #ifdef AMD_BOOTLOC_BUG
        { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock },
+       { CFI_MFR_AMIC, CFI_ID_ANY, fixup_amd_bootblock },
        { CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock },
 #endif
        { CFI_MFR_AMD, 0x0050, fixup_use_secsi },

diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index a9baee6864afe8cd29a38652fbdb04a345b515a9..0d823f2dd6679a27bbf39a224f37725f6e9c6f70 100644 (file)
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -535,6 +535,7 @@ struct cfi_fixup {
 #define CFI_MFR_CONTINUATION   0x007F
 
 #define CFI_MFR_AMD            0x0001
+#define CFI_MFR_AMIC           0x0037
 #define CFI_MFR_ATMEL          0x001F
 #define CFI_MFR_EON            0x001C
 #define CFI_MFR_FUJITSU                0x0004