From patchwork Tue Apr 2 14:47:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim-Ting Kuo X-Patchwork-Id: 233025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3BD8B2C0138 for ; Wed, 3 Apr 2013 01:48:59 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UN2Ud-0001hO-5u; Tue, 02 Apr 2013 14:47:23 +0000 Received: from mail-we0-x230.google.com ([2a00:1450:400c:c03::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UN2Ua-0001go-8V for linux-mtd@lists.infradead.org; Tue, 02 Apr 2013 14:47:21 +0000 Received: by mail-we0-f176.google.com with SMTP id s43so384406wey.7 for ; Tue, 02 Apr 2013 07:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=UwB3WKs+JpS9QFmG5gbP2IqvBqDp9JhtJWY0AaDttjc=; b=Dlawrn1/vr2D5nBJgMqyXEsCOzS13Twh5cBj7NSasOEmEs1hg56El4SR/+uMQBG4DK WUul8vhuWPVIifnRXstDnU3uZodaTYPwaHvJY1loXoIQDWCBPY3zMsEdN+LKG/DjuEy2 FBs+uYFVNqDEPEG/pcO7PrbqcQBb0D9bRbW/u0cDI3Sih+ubpZ7XBq5j8Mb27sCup3Oc M7+CRPEeRPFC3cEt+6LD0Xt1jHvizRJCLX15kqrSsfrVtmLBxUy9aa6MPLW4+vGrAiNB Bu//SYF5aMLFVN+o5YCxCXIK6+hdt71AeBowL1F0iniUETK+DeXZqT6EKRxsSn8NeLo2 CYpA== MIME-Version: 1.0 X-Received: by 10.180.97.233 with SMTP id ed9mr16319103wib.32.1364914033721; Tue, 02 Apr 2013 07:47:13 -0700 (PDT) Received: by 10.227.4.135 with HTTP; Tue, 2 Apr 2013 07:47:13 -0700 (PDT) Date: Tue, 2 Apr 2013 22:47:13 +0800 Message-ID: Subject: [PATCH] mtd: m25p80: add support for Macronix chips From: Jim-Ting Kuo To: dwmw2@infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130402_104720_429140_93F9E0B4 X-CRM114-Status: GOOD ( 12.26 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jimtingkuo[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: linux-mtd@lists.infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org I changed and added JEDEC id of Macronix SPI flash to "m25p_ids" array. This is used for the current Macronix's product. And I initialized Macronix chip's status register to 0 which is needed by some Macronix chips. Thanks! Signed-off-by: Jim Kuo --- drivers/mtd/devices/m25p80.c | 47 ++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 5b6b072..3120062 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -743,16 +743,36 @@ static const struct spi_device_id m25p_ids[] = { { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, 0) }, /* Macronix */ - { "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) }, - { "mx25l4005a", INFO(0xc22013, 0, 64 * 1024, 8, SECT_4K) }, - { "mx25l8005", INFO(0xc22014, 0, 64 * 1024, 16, 0) }, - { "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) }, - { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, 0) }, - { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, 0) }, - { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, - { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, - { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, - { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, + { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) }, + { "mx25l5121e", INFO(0xc22210, 0, 64 * 1024, 1, SECT_4K) }, + { "mx25l1006e", INFO(0xc22011, 0, 64 * 1024, 2, SECT_4K) }, + { "mx25l1021e", INFO(0xc22211, 0, 64 * 1024, 2, SECT_4K) }, + { "mx25l2006e", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) }, + { "mx25l4006e", INFO(0xc22013, 0, 64 * 1024, 8, SECT_4K) }, + { "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) }, + { "mx25v4035", INFO(0xc22553, 0, 64 * 1024, 8, SECT_4K) }, + { "mx25l8006e", INFO(0xc22014, 0, 64 * 1024, 16, 0) }, + { "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, 0) }, + { "mx25v8035", INFO(0xc22554, 0, 64 * 1024, 16, 0) }, + { "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, 0) }, + { "mx25l1633e", INFO(0xc22415, 0, 64 * 1024, 32, 0) }, + { "mx25l1635e", INFO(0xc22515, 0, 64 * 1024, 32, 0) }, + { "mx25u1635e", INFO(0xc22535, 0, 64 * 1024, 32, 0) }, + { "mx25l1655d", INFO(0xc22615, 0, 64 * 1024, 32, 0) }, + { "mx25l3206e", INFO(0xc22016, 0, 64 * 1024, 64, 0) }, + { "mx25l3239e", INFO(0xc22536, 0, 64 * 1024, 64, 0) }, + { "mx25l3225d", INFO(0xc25e16, 0, 64 * 1024, 64, 0) }, + { "mx25l3255d", INFO(0xc29e16, 0, 64 * 1024, 64, 0) }, + { "mx25l6406e", INFO(0xc22017, 0, 64 * 1024, 128, 0) }, + { "mx25l6439e", INFO(0xc22537, 0, 64 * 1024, 128, 0) }, + { "mx25l6455e", INFO(0xc22617, 0, 64 * 1024, 128, 0) }, + { "mx25l12806e", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, + { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256, 0) }, + { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, + { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, + { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, 0) }, + { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, + { "mx66l51235f", INFO(0xc2201a, 0, 64 * 1024, 1024, 0) }, /* Micron */ { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, 0) }, @@ -970,13 +990,14 @@ static int m25p_probe(struct spi_device *spi) dev_set_drvdata(&spi->dev, flash); /* - * Atmel, SST and Intel/Numonyx serial flash tend to power - * up with the software protection bits set + * Atmel, SST, Intel/Numonyx and Macronix serial flash tend + * to power up with the software protection bits set */ if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL || JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL || - JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) { + JEDEC_MFR(info->jedec_id) == CFI_MFR_SST || + JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX) { write_enable(flash); write_sr(flash, 0); }