From patchwork Tue Aug 6 16:17:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagannadha Sutradharudu Teki X-Patchwork-Id: 265130 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id DBE972C21D6 for ; Wed, 7 Aug 2013 02:20:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DAD4F4A04E; Tue, 6 Aug 2013 18:20:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ujj0J5i-u8T0; Tue, 6 Aug 2013 18:20:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 70A694A097; Tue, 6 Aug 2013 18:18:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 388D64A08B for ; Tue, 6 Aug 2013 18:18:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NFDCO6d1TrtU for ; Tue, 6 Aug 2013 18:18:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from db8outboundpool.messaging.microsoft.com (mail-db8lp0188.outbound.messaging.microsoft.com [213.199.154.188]) by theia.denx.de (Postfix) with ESMTPS id 4911A4A044 for ; Tue, 6 Aug 2013 18:18:26 +0200 (CEST) Received: from mail160-db8-R.bigfish.com (10.174.8.251) by DB8EHSOBE037.bigfish.com (10.174.4.100) with Microsoft SMTP Server id 14.1.225.22; Tue, 6 Aug 2013 16:18:26 +0000 Received: from mail160-db8 (localhost [127.0.0.1]) by mail160-db8-R.bigfish.com (Postfix) with ESMTP id C79C62E0302; Tue, 6 Aug 2013 16:18:25 +0000 (UTC) X-Forefront-Antispam-Report: CIP:149.199.60.83; KIP:(null); UIP:(null); IPV:NLI; H:xsj-gw1; RD:unknown-60-83.xilinx.com; EFVD:NLI X-SpamScore: 2 X-BigFish: VPS2(z551bizzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz1de098h8275bh1de097hz2fh95h668h839hd24hf0ah119dh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e1dh1e23h906i1155h192ch) Received-SPF: pass (mail160-db8: domain of xilinx.com designates 149.199.60.83 as permitted sender) client-ip=149.199.60.83; envelope-from=jagannadha.sutradharudu-teki@xilinx.com; helo=xsj-gw1 ; helo=xsj-gw1 ; Received: from mail160-db8 (localhost.localdomain [127.0.0.1]) by mail160-db8 (MessageSwitch) id 1375805903660673_32549; Tue, 6 Aug 2013 16:18:23 +0000 (UTC) Received: from DB8EHSMHS001.bigfish.com (unknown [10.174.8.236]) by mail160-db8.bigfish.com (Postfix) with ESMTP id 9CA00D80049; Tue, 6 Aug 2013 16:18:23 +0000 (UTC) Received: from xsj-gw1 (149.199.60.83) by DB8EHSMHS001.bigfish.com (10.174.4.11) with Microsoft SMTP Server id 14.16.227.3; Tue, 6 Aug 2013 16:18:21 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-smtp1.xilinx.com) by xsj-gw1 with esmtp (Exim 4.63) (envelope-from ) id 1V6jxk-0006wc-SF; Tue, 06 Aug 2013 09:18:20 -0700 From: Jagannadha Sutradharudu Teki To: Date: Tue, 6 Aug 2013 21:47:26 +0530 X-Mailer: git-send-email 1.8.3 In-Reply-To: <1375805851-32163-1-git-send-email-jaganna@xilinx.com> References: <1375805851-32163-1-git-send-email-jaganna@xilinx.com> X-RCIS-Action: ALLOW MIME-Version: 1.0 Message-ID: <05b62f13-72ec-49df-b008-b1548f590df3@DB8EHSMHS001.ehs.local> X-OriginatorOrg: xilinx.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: "Todd Legler (tlegler)" , Willis Max , Jagannadha Sutradharudu Teki , Syed@theia.denx.de, Hussain , Rajeshwari Shinde , Tom Rini Subject: [U-Boot] [RESEND PATCH v2 15/20] sf: probe: Add support for flag status polling X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From Micron, 512MB onwards, flash requires to poll flag status instead of read status- hence added E_FSR flag on spectific flash parts. Signed-off-by: Jagannadha Sutradharudu Teki --- Changes for v2: - none drivers/mtd/spi/spi_flash_probe.c | 14 +++++++++----- include/spi_flash.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi/spi_flash_probe.c b/drivers/mtd/spi/spi_flash_probe.c index 0d005a1..acccee0 100644 --- a/drivers/mtd/spi/spi_flash_probe.c +++ b/drivers/mtd/spi/spi_flash_probe.c @@ -94,10 +94,10 @@ static const struct spi_flash_params spi_flash_params_table[] = { {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, SECT_4K}, {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, SECT_4K}, {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, SECT_4K}, - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, SECT_4K}, - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, SECT_4K}, - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, SECT_4K}, - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, SECT_4K}, + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, E_FSR | SECT_4K}, + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, E_FSR | SECT_4K}, + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, E_FSR | SECT_4K}, + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, E_FSR | SECT_4K}, #endif #ifdef CONFIG_SPI_FLASH_SST /* SST */ {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SECT_4K | SST_WP}, @@ -186,7 +186,6 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->spi = spi; flash->name = params->name; - flash->poll_cmd = CMD_READ_STATUS; /* Assign spi_flash ops */ flash->write = spi_flash_cmd_write_multi; @@ -214,6 +213,11 @@ struct spi_flash *spi_flash_validate_ids(struct spi_slave *spi, u8 *idcode) flash->erase_size = flash->sector_size; } + /* Poll cmd seclection */ + flash->poll_cmd = CMD_READ_STATUS; + if (params->flags & E_FSR) + flash->poll_cmd = CMD_FLAG_STATUS; + /* Flash powers up read-only, so clear BP# bits */ if (((params->jedec >> 16) == SPI_FLASH_CFI_MFR_ATMEL) || ((params->jedec >> 16) == SPI_FLASH_CFI_MFR_MACRONIX) || diff --git a/include/spi_flash.h b/include/spi_flash.h index 387af86..3e60fdc 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -25,6 +25,7 @@ /* SECT flags */ #define SECT_4K (1 << 0) #define SECT_32K (1 << 1) +#define E_FSR (1 << 2) /* SST specific macros */ #ifdef CONFIG_SPI_FLASH_SST