diff options
author | Guillaume LECERF <glecerf@gmail.com> | 2010-10-26 06:31:55 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-26 06:38:48 -0400 |
commit | 9fc05fcadadcf3d6ddfe288e2e5c7ad0773b2abf (patch) | |
tree | f9c4d69386bf3601ab4ca3706df6aff7efdd5a5b /drivers/mtd/chips | |
parent | fc61015f72808f2fd83657909d02f4d29404b8c6 (diff) |
mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
Add support for SST38VF640x chips in CFI mode.
Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
Signed-off-by: yidong zhang <zhangyd6@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/chips')
-rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 19344763fc56..eb8ce0cf2855 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c | |||
@@ -293,6 +293,21 @@ static void fixup_sst39vf_rev_b(struct mtd_info *mtd, void *param) | |||
293 | cfi->addr_unlock2 = 0x2AA; | 293 | cfi->addr_unlock2 = 0x2AA; |
294 | } | 294 | } |
295 | 295 | ||
296 | static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd, void *param) | ||
297 | { | ||
298 | struct map_info *map = mtd->priv; | ||
299 | struct cfi_private *cfi = map->fldrv_priv; | ||
300 | |||
301 | fixup_sst39vf_rev_b(mtd, param); | ||
302 | |||
303 | /* | ||
304 | * CFI reports 1024 sectors (0x03ff+1) of 64KBytes (0x0100*256) where | ||
305 | * it should report a size of 8KBytes (0x0020*256). | ||
306 | */ | ||
307 | cfi->cfiq->EraseRegionInfo[0] = 0x002003ff; | ||
308 | pr_warning("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n", mtd->name); | ||
309 | } | ||
310 | |||
296 | static void fixup_s29gl064n_sectors(struct mtd_info *mtd, void *param) | 311 | static void fixup_s29gl064n_sectors(struct mtd_info *mtd, void *param) |
297 | { | 312 | { |
298 | struct map_info *map = mtd->priv; | 313 | struct map_info *map = mtd->priv; |
@@ -344,6 +359,10 @@ static struct cfi_fixup cfi_fixup_table[] = { | |||
344 | { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors, NULL, }, | 359 | { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors, NULL, }, |
345 | { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors, NULL, }, | 360 | { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors, NULL, }, |
346 | { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors, NULL, }, | 361 | { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors, NULL, }, |
362 | { CFI_MFR_SST, 0x536A, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6402 */ | ||
363 | { CFI_MFR_SST, 0x536B, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6401 */ | ||
364 | { CFI_MFR_SST, 0x536C, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6404 */ | ||
365 | { CFI_MFR_SST, 0x536D, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6403 */ | ||
347 | #if !FORCE_WORD_WRITE | 366 | #if !FORCE_WORD_WRITE |
348 | { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, }, | 367 | { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, }, |
349 | #endif | 368 | #endif |
@@ -374,6 +393,13 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi, | |||
374 | if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && | 393 | if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && |
375 | extp->MajorVersion == '0') | 394 | extp->MajorVersion == '0') |
376 | extp->MajorVersion = '1'; | 395 | extp->MajorVersion = '1'; |
396 | /* | ||
397 | * SST 38VF640x chips report major=0xFF / minor=0xFF. | ||
398 | */ | ||
399 | if (cfi->mfr == CFI_MFR_SST && (cfi->id >> 4) == 0x0536) { | ||
400 | extp->MajorVersion = '1'; | ||
401 | extp->MinorVersion = '0'; | ||
402 | } | ||
377 | } | 403 | } |
378 | 404 | ||
379 | struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) | 405 | struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) |