Message ID | 20101217095941.8560.75355.stgit@shiryu |
---|---|
State | Accepted |
Commit | e637276370cb11068ab185c342eac5a78e5415b4 |
Headers | show |
On Fri, 2010-12-17 at 10:59 +0100, Guillaume LECERF wrote: > These chips report CFI v0.0 [1], so extend cfi_fixup_major_minor() > to patch all Samsung chips from 0.0 to 1.0. > Discussed and tested by the OpenWRT people [2]. > > [1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/64Mbit/K8D6316UTM/ds_K8D6x16UxM_rev16.pdf > [2] https://dev.openwrt.org/ticket/7348 > > Signed-off-by: Guillaume LECERF <glecerf@gmail.com> > Acked-by: Wolfram Sang <w.sang@pengutronix.de> Pushed both patches to l2-mtd-2.6.git, thank you!
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 9d68ab9..324fee4 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -392,9 +392,19 @@ 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'; + if (cfi->mfr == CFI_MFR_SAMSUNG) { + if (extp->MajorVersion == '0' && extp->MinorVersion == '0') { + /* + * Samsung K8P2815UQB and K8D6x16UxM chips + * report major=0 / minor=0. + */ + printk(KERN_NOTICE " Fixing Samsung's Amd/Fujitsu" + " Extended Query version to 1.%c\n", + extp->MinorVersion); + extp->MajorVersion = '1'; + } + } + /* * SST 38VF640x chips report major=0xFF / minor=0xFF. */