mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips

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>
Acked-by: Wolfram Sang <w.sang@pengutronix.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 324fee4024a9438b4e6e83846bf0dce0218fafc7..a43ab45bdb180625293e8c6e6c7d018d7bd607b5 100644 (file)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -393,10 +393,12 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi,
                                  struct cfi_pri_amdstd *extp)
 {
        if (cfi->mfr == CFI_MFR_SAMSUNG) {
-               if (extp->MajorVersion == '0' && extp->MinorVersion == '0') {
+               if ((extp->MajorVersion == '0' && extp->MinorVersion == '0') ||
+                   (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
                        /*
                         * Samsung K8P2815UQB and K8D6x16UxM chips
                         * report major=0 / minor=0.
+                        * K8D3x16UxC chips report major=3 / minor=3.
                         */
                        printk(KERN_NOTICE "  Fixing Samsung's Amd/Fujitsu"
                               " Extended Query version to 1.%c\n",