From patchwork Tue Nov 26 06:32:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 3236781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 102ADC045B for ; Tue, 26 Nov 2013 07:01:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D493720380 for ; Tue, 26 Nov 2013 07:01:09 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5285B2037B for ; Tue, 26 Nov 2013 07:01:08 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VlCcI-0004Vp-6S; Tue, 26 Nov 2013 06:59:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VlCbz-0001g1-US; Tue, 26 Nov 2013 06:59:07 +0000 Received: from mail-db9lp0248.outbound.messaging.microsoft.com ([213.199.154.248] helo=db9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VlCbD-0001Zc-0E; Tue, 26 Nov 2013 06:58:36 +0000 Received: from mail95-db9-R.bigfish.com (10.174.16.235) by DB9EHSOBE035.bigfish.com (10.174.14.98) with Microsoft SMTP Server id 14.1.225.22; Tue, 26 Nov 2013 06:57:52 +0000 Received: from mail95-db9 (localhost [127.0.0.1]) by mail95-db9-R.bigfish.com (Postfix) with ESMTP id 5A02030070E; Tue, 26 Nov 2013 06:57:52 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 6 X-BigFish: VS6(z3121kzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h1155h) Received: from mail95-db9 (localhost.localdomain [127.0.0.1]) by mail95-db9 (MessageSwitch) id 1385449070906839_9711; Tue, 26 Nov 2013 06:57:50 +0000 (UTC) Received: from DB9EHSMHS014.bigfish.com (unknown [10.174.16.249]) by mail95-db9.bigfish.com (Postfix) with ESMTP id D703D600CD; Tue, 26 Nov 2013 06:57:50 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB9EHSMHS014.bigfish.com (10.174.14.24) with Microsoft SMTP Server (TLS) id 14.16.227.3; Tue, 26 Nov 2013 06:57:50 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.158.2; Tue, 26 Nov 2013 06:57:50 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id rAQ6vao7020469; Mon, 25 Nov 2013 23:57:46 -0700 From: Huang Shijie To: Subject: [PATCH 2/4] mtd: spi-nor: add a new data structrue spi_nor{} Date: Tue, 26 Nov 2013 14:32:53 +0800 Message-ID: <1385447575-23773-3-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.2.rc3 In-Reply-To: <1385447575-23773-1-git-send-email-b32955@freescale.com> References: <1385447575-23773-1-git-send-email-b32955@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131126_015819_318091_0A6E7090 X-CRM114-Status: GOOD ( 12.27 ) X-Spam-Score: -1.9 (-) Cc: marex@denx.de, broonie@linaro.org, Huang Shijie , linux-mtd@lists.infradead.org, pekon@ti.com, sourav.poddar@ti.com, computersforpeace@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The spi_nor{} is cloned from the m25p{}. The spi_nor{} can be used by both the m25p80 and spi-nor controller. 1) Add four hooks: @read_reg: used to read the registers, such as read status register, read ID, read configure register. @write_reg: used to write the registers, such as write enable, erase sector. @read: use the proper read opcode to read out the data from the NOR. @write: use the proper write opcode to write data to the NOR. 2) Add a new field sst_write_second for the SST NOR write. 3) change the @command field from pointer to array which makes the code more simple. Signed-off-by: Huang Shijie --- drivers/mtd/devices/m25p80.c | 6 ----- include/linux/mtd/spi-nor.h | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 4703aa4..13d9864 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -44,12 +44,6 @@ /****************************************************************************/ -enum read_type { - M25P80_NORMAL = 0, - M25P80_FAST, - M25P80_QUAD, -}; - struct m25p { struct spi_device *spi; struct mutex lock; diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index ab2ea1e..8da1f69 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -50,4 +50,47 @@ /* Configuration Register bits. */ #define CR_QUAD_EN_SPAN 0x2 /* Spansion Quad I/O */ +#define MAX_CMD_SIZE 6 + +enum read_type { + M25P80_NORMAL = 0, + M25P80_FAST, + M25P80_QUAD, +}; + +struct spi_nor { + struct mutex lock; + struct mtd_info mtd; + struct device *dev; + u16 page_size; + u16 addr_width; + u8 erase_opcode; + u8 read_opcode; + u8 program_opcode; + u8 command[MAX_CMD_SIZE]; + enum read_type flash_read; + bool sst_write_second; + + /* + * Read the register: + * Read `len` length data from the register specified by the `opcode`, + * and store the data to the `buf`. + */ + int (*read_reg)(struct spi_nor *flash, u8 opcode, u8 *buf, int len); + + /* + * Write the register: + * Write the `cmd_len` length data stored in the @command to the NOR, + * the command[0] stores the write opcode. `offset` is only used for + * erase operation, it should set to zero for other NOR commands. + */ + int (*write_reg)(struct spi_nor *flash, int cmd_len, u32 offset); + + /* write data */ + void (*write)(struct spi_nor *flash, loff_t to, size_t len, + size_t *retlen, const u_char *buf); + /* read data */ + int (*read)(struct spi_nor *flash, loff_t from, size_t len, + size_t *retlen, u_char *buf); +}; #endif