From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp1-g21.free.fr ([212.27.42.1]) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PQLiQ-0000zV-BV for linux-mtd@lists.infradead.org; Wed, 08 Dec 2010 15:13:59 +0000 Subject: [PATCH 2/2] mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips To: linux-mtd@lists.infradead.org From: Guillaume LECERF Date: Wed, 08 Dec 2010 16:07:15 +0100 Message-ID: <20101208150715.19706.65528.stgit@dev.siriade.com> In-Reply-To: <20101208150710.19706.92098.stgit@dev.siriade.com> References: <20101208150710.19706.92098.stgit@dev.siriade.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Matthias Buecher / Germany , David Woodhouse List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- drivers/mtd/chips/cfi_cmdset_0002.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 28e05ad..bf015e7 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -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'; + } } /*