From patchwork Mon Jan 20 17:04:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagannadha Sutradharudu Teki X-Patchwork-Id: 312673 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 0ACED2C0086 for ; Tue, 21 Jan 2014 04:05:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F12C24B3AE; Mon, 20 Jan 2014 18:05:40 +0100 (CET) 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 QzuNPgLPMVro; Mon, 20 Jan 2014 18:05:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 385434B3C3; Mon, 20 Jan 2014 18:05:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 15FA54B3B9 for ; Mon, 20 Jan 2014 18:05:28 +0100 (CET) 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 x0L2HpEJzYak for ; Mon, 20 Jan 2014 18:05:21 +0100 (CET) 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 7740E4B3AE for ; Mon, 20 Jan 2014 18:05:14 +0100 (CET) Received: from mail54-db8-R.bigfish.com (10.174.8.243) by DB8EHSOBE004.bigfish.com (10.174.4.67) with Microsoft SMTP Server id 14.1.225.22; Mon, 20 Jan 2014 17:05:13 +0000 Received: from mail54-db8 (localhost [127.0.0.1]) by mail54-db8-R.bigfish.com (Postfix) with ESMTP id 4D13930017A; Mon, 20 Jan 2014 17:05:13 +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: 1 X-BigFish: VPS1(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275bh1de097hz2fh95h839hd24hf0ah119dh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1b0ah224fh1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e1dh1e23h1fe8h1ff5h2218h2216h226dh24afh2327h2336h2438h2461h2487h906i1155h) Received-SPF: pass (mail54-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 mail54-db8 (localhost.localdomain [127.0.0.1]) by mail54-db8 (MessageSwitch) id 1390237511397863_31236; Mon, 20 Jan 2014 17:05:11 +0000 (UTC) Received: from DB8EHSMHS023.bigfish.com (unknown [10.174.8.235]) by mail54-db8.bigfish.com (Postfix) with ESMTP id 5C613B4004C; Mon, 20 Jan 2014 17:05:11 +0000 (UTC) Received: from xsj-gw1 (149.199.60.83) by DB8EHSMHS023.bigfish.com (10.174.4.33) with Microsoft SMTP Server id 14.16.227.3; Mon, 20 Jan 2014 17:05:10 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-smtp1) by xsj-gw1 with esmtp (Exim 4.63) (envelope-from ) id 1W5IHe-0001j6-27; Mon, 20 Jan 2014 09:05:10 -0800 From: Jagannadha Sutradharudu Teki To: Date: Mon, 20 Jan 2014 22:34:56 +0530 X-Mailer: git-send-email 1.8.3 X-RCIS-Action: ALLOW MIME-Version: 1.0 Message-ID: <43eb8949-d615-4c86-97d2-bc14ddf77b43@DB8EHSMHS023.ehs.local> X-OriginatorOrg: xilinx.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: Tom Rini , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH v3] sf: Update bank configuration 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 Updated bank configuration code to more readable. Signed-off-by: Jagannadha Sutradharudu Teki --- Changes for v3: - remove bank_curr = 0 for non bank case Changes for v2: - none drivers/mtd/spi/sf_probe.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index a5f3046..53995e4 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -217,21 +217,22 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, /* Configure the BAR - discover bank cmds and read current bank */ #ifdef CONFIG_SPI_FLASH_BAR - u8 curr_bank = 0; if (flash->size > SPI_FLASH_16MB_BOUN) { - flash->bank_read_cmd = (idcode[0] == 0x01) ? - CMD_BANKADDR_BRRD : CMD_EXTNADDR_RDEAR; - flash->bank_write_cmd = (idcode[0] == 0x01) ? - CMD_BANKADDR_BRWR : CMD_EXTNADDR_WREAR; + switch (idcode[0]) { + case SPI_FLASH_CFI_MFR_SPANSION: + flash->bank_read_cmd = CMD_BANKADDR_BRRD; + flash->bank_write_cmd = CMD_BANKADDR_BRWR; + break; + default: + flash->bank_read_cmd = CMD_EXTNADDR_RDEAR; + flash->bank_write_cmd = CMD_EXTNADDR_WREAR; + } if (spi_flash_read_common(flash, &flash->bank_read_cmd, 1, - &curr_bank, 1)) { - debug("SF: fail to read bank addr register\n"); + &flash->bank_curr, 1)) { + debug("SF: Fail to read bank addr register\n"); return NULL; } - flash->bank_curr = curr_bank; - } else { - flash->bank_curr = curr_bank; } #endif