@@ -395,7 +395,7 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi,
if (cfi->mfr == CFI_MFR_SAMSUNG) {
if (extp->MajorVersion == '0') {
/*
- * Samsung K8P2815UQB and K8D6x16UxM report major=0 / minor=0
+ * Samsung K8P2815UQB and K8D6x16UxM chips report major=0 / minor=0
*/
printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.0",
extp->MajorVersion, extp->MinorVersion);
@@ -403,6 +403,19 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi,
extp->MajorVersion = '1';
extp->MinorVersion = '0';
}
+ if (extp->MajorVersion == '3' && extp->MinorVersion == '3') {
+ /*
+ * Samsung K8D3x16UxC chips report major=3 / minor=3
+ */
+ printk(KERN_NOTICE " Newer Samsung flash detected, "
+ "should be compatibile with Amd/Fujitsu.\n");
+
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.3",
+ extp->MajorVersion, extp->MinorVersion);
+
+ extp->MajorVersion = '1'; // set to 1.3
+ extp->MinorVersion = '3';
+ }
}
/*
These chips report CFI v3.3 [1], so patch them on the fly to the more correct v1.3. Discussed and tested by the OpenWRT people [2]. [1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/32Mbit/K8D3216UBC/ds_K8D3x16UxC_rev17.pdf [2] https://dev.openwrt.org/ticket/866 Signed-off-by: Guillaume LECERF <glecerf@gmail.com> --- drivers/mtd/chips/cfi_cmdset_0002.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)