| Message ID | 1468943314-18468-7-git-send-email-sivadur@xilinx.com |
|---|---|
| State | Deferred |
| Delegated to: | Michal Simek |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 3rtwzY0kkRz9sBR for <incoming@patchwork.ozlabs.org>; Tue, 19 Jul 2016 20:20:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D19ABA7579; Tue, 19 Jul 2016 12:20:11 +0200 (CEST) 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 YpvumZpn7yYF; Tue, 19 Jul 2016 12:20:11 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65756A75D6; Tue, 19 Jul 2016 12:19:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 842EFA755F for <u-boot@lists.denx.de>; Tue, 19 Jul 2016 12:19:43 +0200 (CEST) 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 Utx5PgdRuPsB for <u-boot@lists.denx.de>; Tue, 19 Jul 2016 12:19:43 +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 NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0054.outbound.protection.outlook.com [104.47.36.54]) by theia.denx.de (Postfix) with ESMTPS id 04D35A7573 for <u-boot@lists.denx.de>; Tue, 19 Jul 2016 12:19:30 +0200 (CEST) Received: from SN1NAM02FT011.eop-nam02.prod.protection.outlook.com (10.152.72.55) by SN1NAM02HT066.eop-nam02.prod.protection.outlook.com (10.152.73.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.539.16; Tue, 19 Jul 2016 10:19:26 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT011.mail.protection.outlook.com (10.152.72.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.539.16 via Frontend Transport; Tue, 19 Jul 2016 10:19:25 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:45834 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from <siva.durga.paladugu@xilinx.com>) id 1bPS7U-0004YU-Rr; Tue, 19 Jul 2016 03:19:20 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from <siva.durga.paladugu@xilinx.com>) id 1bPS7Y-00079C-Lo; Tue, 19 Jul 2016 03:19:24 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u6JAJMTQ021270; Tue, 19 Jul 2016 03:19:22 -0700 Received: from [172.23.37.99] (helo=xhdsivadur40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from <sivadur@xilinx.com>) id 1bPS7V-0006zk-VA; Tue, 19 Jul 2016 03:19:22 -0700 From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> To: <u-boot@lists.denx.de> Date: Tue, 19 Jul 2016 21:18:31 +0530 Message-ID: <1468943314-18468-7-git-send-email-sivadur@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468943314-18468-1-git-send-email-sivadur@xilinx.com> References: <1468943314-18468-1-git-send-email-sivadur@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-22460.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(7916002)(2980300002)(438002)(199003)(189002)(76176999)(19580405001)(19580395003)(50986999)(7696003)(5003600100003)(4001430100002)(7846002)(50226002)(81166006)(305945005)(81156014)(47776003)(5003940100001)(48376002)(87936001)(2906002)(50466002)(106466001)(33646002)(229853001)(2351001)(63266004)(9786002)(8936002)(11100500001)(4326007)(86362001)(36756003)(8676002)(189998001)(586003)(36386004)(2950100001)(356003)(110136002)(77096005)(107886002)(92566002)(107986001)(5001870100001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1NAM02HT066; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 91f14b0d-dc73-4dbd-d434-08d3afbe297f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:SN1NAM02HT066; X-Microsoft-Antispam-PRVS: <171637b3aca04dd5aa51d65a7a167325@SN1NAM02HT066.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13023025)(13024025)(13015025)(8121501046)(13017025)(5005006)(10201501046)(3002001)(6055026); SRVR:SN1NAM02HT066; BCL:0; PCL:0; RULEID:; SRVR:SN1NAM02HT066; X-Forefront-PRVS: 000800954F X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2016 10:19:25.6134 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT066 Cc: michals@xilinx.com, Siva Durga Prasad Paladugu <sivadur@xilinx.com> Subject: [U-Boot] [PATCH v2 6/9] spi: spi_flash: Correct flash size calculation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 1be3e56..ef9b877 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1167,7 +1167,7 @@ int spi_flash_scan(struct spi_flash *flash) } flash->page_size <<= flash->shift; flash->sector_size = params->sector_size << flash->shift; - flash->size = flash->sector_size * params->nr_sectors << flash->shift; + flash->size = flash->sector_size * params->nr_sectors; #ifdef CONFIG_SF_DUAL_FLASH if (flash->dual_flash & SF_DUAL_STACKED_FLASH) flash->size <<= 1;
Dont need to double the size while calculating the flash size as the sector size calculation already takes care of doubling the size incase of dual modes Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> --- drivers/mtd/spi/spi_flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)