From patchwork Mon Oct 13 21:20:49 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartley Sweeten X-Patchwork-Id: 4354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36F1DDDED4 for ; Tue, 14 Oct 2008 08:23:45 +1100 (EST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1KpUrU-00076u-Uf; Mon, 13 Oct 2008 21:21:56 +0000 Received: from exprod6og108.obsmtp.com ([64.18.1.21]) by bombadil.infradead.org with smtp (Exim 4.68 #1 (Red Hat Linux)) id 1KpUrT-00076p-H4 for linux-mtd@lists.infradead.org; Mon, 13 Oct 2008 21:21:55 +0000 Received: from source ([63.240.6.3]) (using TLSv1) by exprod6ob108.postini.com ([64.18.5.12]) with SMTP; Mon, 13 Oct 2008 14:21:50 PDT Received: from d01smtp07.Mi8.com ([172.16.1.114]) by Outbound01.Mi8.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 17:21:50 -0400 Received: from mi8nycmail19.Mi8.com ([172.16.7.219]) by d01smtp07.Mi8.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 17:21:49 -0400 X-MIMEOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: [PATCH] mtd: m25p80.c add support for non-JEDEC ID devices Date: Mon, 13 Oct 2008 17:20:49 -0400 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] mtd: m25p80.c add support for non-JEDEC ID devices Thread-Index: AckteZBSgmXGxajBSDqEg8TAdxRMIA== From: "hartleys" To: X-OriginalArrivalTime: 13 Oct 2008 21:21:49.0610 (UTC) FILETIME=[B44E68A0:01C92D79] X-Spam-Score: -4.0 (----) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (-4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -4.0 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [64.18.1.21 listed in list.dnswl.org] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Hello all, This patch allows the m25p80 driver to support non-JEDEC ID devices. It has been tested on an EP93xx based ARM platform with a SST25LF020A 2Mbit SPI Serial Flash device. Any comments would be appreciated. Thanks, Signed-off-by: H Hartley Sweeten --- #define SR_WIP 1 /* Write in progress */ @@ -507,13 +508,17 @@ static struct flash_info __devinitdata m25p_data [] = { { "w25x16", 0xef3015, 64 * 1024, 32, SECT_4K, }, { "w25x32", 0xef3016, 64 * 1024, 64, SECT_4K, }, { "w25x64", 0xef3017, 64 * 1024, 128, SECT_4K, }, + + /* Non JEDEC ID SST -- large erase sizes are "overlays", "sectors" are 4K */ + { "sst25lf020a", 0xbf43, 32 * 1024, 8, SECT_4K, }, + { "sst25lf040a", 0xbf44, 32 * 1024, 16, SECT_4K, }, }; static struct flash_info *__devinit jedec_probe(struct spi_device *spi) { int tmp; - u8 code = OPCODE_RDID; - u8 id[3]; + u8 code[4]; + u8 id[4]; u32 jedec; struct flash_info *info; @@ -521,7 +526,8 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) * string for after vendor-specific data, after the three bytes * we use here. Supporting some chips might require using it. */ - tmp = spi_write_then_read(spi, &code, 1, id, 3); + code[0] = OPCODE_RDID; + tmp = spi_write_then_read(spi, code, 1, id, 3); if (tmp < 0) { DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n", spi->dev.bus_id, tmp); @@ -540,6 +546,31 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) return info; } dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec); + + /* Try reading the non-JEDEC Manufacture/Device ID */ + code[0] = OPCODE_RDID_NON_JEDEC; + code[1] = 0x00; + code[2] = 0x00; + code[3] = 0x00; + tmp = spi_write_then_read(spi, code, 4, id, 2); + if (tmp < 0) { + DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading ID\n", + spi->dev.bus_id, tmp); + return NULL; + } + + jedec = id[0]; + jedec = jedec << 8; + jedec |= id[1]; + + for (tmp = 0, info = m25p_data; + tmp < ARRAY_SIZE(m25p_data); + tmp++, info++) { + if (info->jedec_id == jedec) + return info; + } + dev_err(&spi->dev, "unrecognized id %04x\n", jedec); + return NULL; } diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index b35c333..ee6dd52 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -41,6 +41,7 @@ #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ #define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */ #define OPCODE_RDID 0x9f /* Read JEDEC ID */ +#define OPCODE_RDID_NON_JEDEC 0x90 /* Read non-JEDEC ID */ /* Status Register bits. */