From patchwork Tue Sep 20 21:06:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 672459 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 3sdwNL3pJXz9sBg for ; Wed, 21 Sep 2016 07:08:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=bAZGJdG8; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4CB5A75A8; Tue, 20 Sep 2016 23:08:17 +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 8YvqDjUEVtTs; Tue, 20 Sep 2016 23:08:17 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3CF9B4BA29; Tue, 20 Sep 2016 23:08:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7914DA7558 for ; Tue, 20 Sep 2016 23:07:58 +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 969DbsdN7BNo for ; Tue, 20 Sep 2016 23:07:58 +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 mail-pa0-f65.google.com (mail-pa0-f65.google.com [209.85.220.65]) by theia.denx.de (Postfix) with ESMTPS id 05E074B6B3 for ; Tue, 20 Sep 2016 23:07:52 +0200 (CEST) Received: by mail-pa0-f65.google.com with SMTP id hi10so1347024pac.2 for ; Tue, 20 Sep 2016 14:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FB+Eq0gFCqtMinrA3HzehTCH6RqDLcfrh4MPmbmy0I8=; b=bAZGJdG8qtrFxyFfSfEGbGKMVA4A5JX3PXUrZcRfrVqCNfgquUXc/q1/b9gEcO6Hh3 tHUneh3++u1+VqxhlbY95CIAVcKCVJIlE4FDvEbrjbMGPW1wn/sz99UzXE8ZbB5q/YAX ZM+nw3x07h6kW3mk8SgOff+zGOqYe9Nyvj+mjr6h21gYfGOdQXxOmCeSDV9aZzwmjbI9 +nbRQblRVWFou/ut5PIlGlACjWnmCcEVgQLWH5adrBttLYeqqLiz5Bdu8GQ0QgDlhia8 8WTIdf14OCfwpBrPDoMfGdHVZnqVAFnth3wBlZOey7b7FYx872mN6Lh2NbZuihrTTiT+ BzUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FB+Eq0gFCqtMinrA3HzehTCH6RqDLcfrh4MPmbmy0I8=; b=LnGUl2moykjy69txGKBD95uiqd2ZRkEycCMSpCssp+tNpJmAfG9E9KjaY/lNTbXhzT yZfBqKzwOIsboQKDpMF9uCWBdZkxMuqGE9BXnzRv3iVfg2JmX68cldvn1tJzHrH/ogL9 N5p/KiwEwlzIXD7Eptms3umbnOMExeQLnQCOB0ZrALx2efffPcHnlGMR38V0/rXgms7K z0WHAiaRcmMqrGOMYhqUSCFikDZWWNLGBVubXPDKmyl2goARkscfu5ANFHV3ltRGBYa/ uQdu24r32ugUpoO8FZyZwnfHRuaw/3dtr0Q2zr8Y4UaWHkEBEHmbr//5mHE+pftlK9+c uG/Q== X-Gm-Message-State: AE9vXwORy1IOrYCgaWgd9FGY0yc3/Vw64qc1RHqFiCRbjzwUkZ8OCfVpeUj85whvvDFoBw== X-Received: by 10.66.145.73 with SMTP id ss9mr59189594pab.82.1474405670646; Tue, 20 Sep 2016 14:07:50 -0700 (PDT) Received: from Mr.J ([49.204.230.134]) by smtp.gmail.com with ESMTPSA id p1sm3495916pae.12.2016.09.20.14.07.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Sep 2016 14:07:49 -0700 (PDT) From: Jagan Teki To: u-boot@lists.denx.de Date: Wed, 21 Sep 2016 02:36:46 +0530 Message-Id: <1474405608-8126-6-git-send-email-jagannadh.teki@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474405608-8126-1-git-send-email-jagannadh.teki@gmail.com> References: <1474405608-8126-1-git-send-email-jagannadh.teki@gmail.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v4 5/7] sf: Remove SECT_32K X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jagan Teki SECT_32K never used anywhere in the code. Cc: Simon Glass Cc: Bin Meng Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Cc: Vignesh R Cc: Mugunthan V N Signed-off-by: Jagan Teki --- drivers/mtd/spi/sandbox.c | 5 +---- drivers/mtd/spi/sf_internal.h | 16 +++++++--------- drivers/mtd/spi/spi_flash.c | 3 --- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 53470b9..f59134f 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -292,10 +292,7 @@ static int sandbox_sf_process_cmd(struct sandbox_spi_flash *sbsf, const u8 *rx, sbsf->data->nr_sectors; } else if (sbsf->cmd == CMD_ERASE_4K && (flags & SECT_4K)) { sbsf->erase_size = 4 << 10; - } else if (sbsf->cmd == CMD_ERASE_32K && (flags & SECT_32K)) { - sbsf->erase_size = 32 << 10; - } else if (sbsf->cmd == CMD_ERASE_64K && - !(flags & (SECT_4K | SECT_32K))) { + } else if (sbsf->cmd == CMD_ERASE_64K && !(flags & SECT_4K)) { sbsf->erase_size = 64 << 10; } else { debug(" cmd unknown: %#x\n", sbsf->cmd); diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 71ba1a6..9eb0b84 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -27,14 +27,13 @@ enum { #else SECT_4K = BIT(0), #endif - SECT_32K = BIT(1), - E_FSR = BIT(2), - SST_WR = BIT(3), - WR_QPP = BIT(4), - RD_QUAD = BIT(5), - RD_DUAL = BIT(6), - RD_QUADIO = BIT(7), - RD_DUALIO = BIT(8), + E_FSR = BIT(1), + SST_WR = BIT(2), + WR_QPP = BIT(3), + RD_QUAD = BIT(4), + RD_DUAL = BIT(5), + RD_QUADIO = BIT(6), + RD_DUALIO = BIT(7), }; #define RD_FULL RD_QUAD | RD_DUAL | RD_QUADIO | RD_DUALIO @@ -57,7 +56,6 @@ enum spi_nor_option_flags { /* Erase commands */ #define CMD_ERASE_4K 0x20 -#define CMD_ERASE_32K 0x52 #define CMD_ERASE_CHIP 0xc7 #define CMD_ERASE_64K 0xd8 diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 041b64f..2b2a409 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1159,9 +1159,6 @@ int spi_flash_scan(struct spi_flash *flash) if (params->flags & SECT_4K) { flash->erase_cmd = CMD_ERASE_4K; flash->erase_size = 4096 << flash->shift; - } else if (params->flags & SECT_32K) { - flash->erase_cmd = CMD_ERASE_32K; - flash->erase_size = 32768 << flash->shift; } else { flash->erase_cmd = CMD_ERASE_64K; flash->erase_size = flash->sector_size;