From patchwork Mon Aug 26 04:41:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 2849382 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A6CAF9F2F4 for ; Mon, 26 Aug 2013 04:50:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93B54201FE for ; Mon, 26 Aug 2013 04:50:02 +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 87AC8201FC for ; Mon, 26 Aug 2013 04:50:01 +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 1VDojU-0004If-4L; Mon, 26 Aug 2013 04:48:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VDoiw-0004QW-2P; Mon, 26 Aug 2013 04:48:18 +0000 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VDohq-0004GR-5V; Mon, 26 Aug 2013 04:47:12 +0000 Received: from mail162-va3-R.bigfish.com (10.7.14.240) by VA3EHSOBE004.bigfish.com (10.7.40.24) with Microsoft SMTP Server id 14.1.225.22; Mon, 26 Aug 2013 04:46:59 +0000 Received: from mail162-va3 (localhost [127.0.0.1]) by mail162-va3-R.bigfish.com (Postfix) with ESMTP id F323D260214; Mon, 26 Aug 2013 04:46:58 +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: 3 X-BigFish: VS3(zzzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h1155h) Received: from mail162-va3 (localhost.localdomain [127.0.0.1]) by mail162-va3 (MessageSwitch) id 1377492416754708_7599; Mon, 26 Aug 2013 04:46:56 +0000 (UTC) Received: from VA3EHSMHS023.bigfish.com (unknown [10.7.14.231]) by mail162-va3.bigfish.com (Postfix) with ESMTP id B1B931C004C; Mon, 26 Aug 2013 04:46:56 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS023.bigfish.com (10.7.99.33) with Microsoft SMTP Server (TLS) id 14.16.227.3; Mon, 26 Aug 2013 04:46:56 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.3.146.2; Mon, 26 Aug 2013 04:46:56 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r7Q4kVsX024335; Sun, 25 Aug 2013 21:46:51 -0700 From: Huang Shijie To: Subject: [PATCH v2 4/8] mtd: m25p80: add the DDR quad-read support Date: Mon, 26 Aug 2013 12:41:38 +0800 Message-ID: <1377492102-23543-5-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1377492102-23543-1-git-send-email-b32955@freescale.com> References: <1377492102-23543-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-20130826_004710_448721_6BA8E498 X-CRM114-Status: GOOD ( 15.11 ) X-Spam-Score: -2.6 (--) Cc: B20596@freescale.com, computersforpeace@gmail.com, b44548@freescale.com, dedekind1@gmail.com, linux-doc@vger.kernel.org, b18965@freescale.com, linux-spi@vger.kernel.org, Huang Shijie , devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, kernel@pengutronix.de, shawn.guo@linaro.org, dwmw2@infradead.org, 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=-6.4 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 This patch adds the DDR quad read support by: (1) Add the relative commands: OPCODE_DDRQIOR, OPCODE_4DDRQIOR (2) add the "m25p,ddr-quad-read" property for the m25p80 driver If the dts has the "m25p,ddr-quad-read" property, the kernel will set the Quad bit of the configuration register, and when the setting suceedes, we will set the read opcode with the right spi nor command. Signed-off-by: Huang Shijie --- Documentation/devicetree/bindings/mtd/m25p80.txt | 5 +++++ drivers/mtd/devices/m25p80.c | 21 ++++++++++++++++----- include/linux/mtd/spi-nor.h | 2 ++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/mtd/m25p80.txt b/Documentation/devicetree/bindings/mtd/m25p80.txt index b33313f..a01c6b7 100644 --- a/Documentation/devicetree/bindings/mtd/m25p80.txt +++ b/Documentation/devicetree/bindings/mtd/m25p80.txt @@ -22,6 +22,11 @@ Optional properties: all chips and support for it can not be detected at runtime. Refer to your chips' datasheet to check if this is supported by your chip. +- m25p,ddr-quad-read : Use the "ddr quad read" opcode to read data from the chip + instead of the usual "read" opcode. This opcode is not + supported by all chips and support for it can not be detected + at runtime. Refer to your chips' datasheet to check if this + is supported by your chip. Example: flash: m25p80@0 { diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 0645c9f..32ccdc7 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -913,7 +913,8 @@ static void m25p80_check_quad_read(struct m25p *flash, struct device_node *np) int ret; int sr_cr; - if (of_property_read_bool(np, "m25p,quad-read")) { + if (of_property_read_bool(np, "m25p,quad-read") + || of_property_read_bool(np, "m25p,ddr-quad-read")) { /* The configuration register is set by the second byte. */ sr_cr = CR_QUAD << 8; @@ -927,10 +928,20 @@ static void m25p80_check_quad_read(struct m25p *flash, struct device_node *np) if (!(ret > 0 && (ret & CR_QUAD))) return; - if (flash->mtd.size <= SZ_16M) - flash->read_opcode = OPCODE_QIOR; - else - flash->read_opcode = OPCODE_4QIOR; + if (of_property_read_bool(np, "m25p,quad-read")) { + if (flash->mtd.size <= SZ_16M) + flash->read_opcode = OPCODE_QIOR; + else + flash->read_opcode = OPCODE_4QIOR; + return; + } + + if (of_property_read_bool(np, "m25p,ddr-quad-read")) { + if (flash->mtd.size <= SZ_16M) + flash->read_opcode = OPCODE_DDRQIOR; + else + flash->read_opcode = OPCODE_4DDRQIOR; + } } } diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index e6c3309..a985336 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -42,6 +42,8 @@ #define OPCODE_BRWR 0x17 /* Bank register write */ #define OPCODE_QIOR 0xeb /* Quad read */ #define OPCODE_4QIOR 0xec /* Quad read (4-byte)*/ +#define OPCODE_DDRQIOR 0xed /* DDR Quad read */ +#define OPCODE_4DDRQIOR 0xee /* DDR Quad read (4-byte)*/ #define OPCODE_RDCR 0x35 /* Read configuration register */ /* Status Register bits. */