From patchwork Wed Nov 16 04:02:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 695419 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 3tJVxn4L7Mz9syB for ; Wed, 16 Nov 2016 15:04:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 092234BA81; Wed, 16 Nov 2016 05:04:05 +0100 (CET) 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 i-sltWpiehU6; Wed, 16 Nov 2016 05:04:04 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 97A85B382B; Wed, 16 Nov 2016 05:04:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF7C64B98B for ; Wed, 16 Nov 2016 05:03:56 +0100 (CET) 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 4hjP0-8TZM3m for ; Wed, 16 Nov 2016 05:03:56 +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 mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by theia.denx.de (Postfix) with ESMTPS id 1BD534BF90 for ; Wed, 16 Nov 2016 05:03:49 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id p66so13503453pga.2 for ; Tue, 15 Nov 2016 20:03:49 -0800 (PST) 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=bSjHSLD1VPI7tJf+XABOJvFTVv151+wM2sOkoh6Qanw=; b=jD8PL+8UtRh7GliHGFDWwhbrq5spSl1sjyqyJtfjmmNImaYptjDtcCzDTpeVPhPX9l EGg++B1C9QkLnG1ztcLKz82RJRKTcdGrWGGHi/qyU5I02eIx2A2Eg8L7xUdSi0GKyJQa M3nhnuMeBGgOxkcr2MDa0pKsc1zbNWQdojighuCWlAbLzFzH5olPVAh3M0HxpFAOhfsE EnVTBJ8jLqmyfhJjBbch/fUBDDUhT7d1h1TBUE7K/Zf588/+KNjEX1r4QPVuCV08J4XL XI9Xj4+dANxgDVGiouvia28fParzRL9iCzQRMZxDHLjvXg2y0CiDRRHToNfuy2SYlEdQ Cqlg== X-Gm-Message-State: ABUngvcbB7jbZWaOqqqEo9FmZWZ8jMVpSZBBH+aWRc6lJcT/7HMKzVFzkIHivKU+lVCUKw== X-Received: by 10.99.117.71 with SMTP id f7mr3633601pgn.126.1479269028394; Tue, 15 Nov 2016 20:03:48 -0800 (PST) Received: from localhost.localdomain ([115.97.183.210]) by smtp.gmail.com with ESMTPSA id q145sm25217663pfq.22.2016.11.15.20.03.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Nov 2016 20:03:47 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Wed, 16 Nov 2016 09:32:53 +0530 Message-Id: <1479268992-26811-3-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479268992-26811-1-git-send-email-jagan@openedev.com> References: <1479268992-26811-1-git-send-email-jagan@openedev.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v6 02/21] sf: Simplify lock ops detection code 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" Simplify the flash_lock ops detection code and added meaningful comment. Cc: Bin Meng Cc: York Sun Cc: Vignesh R Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki Reviewed-by: Simon Glass Reviewed-by: Jagan Teki Tested-by: Jagan Teki Reviewed-by: Siva Durga Prasad Paladugu --- drivers/mtd/spi/spi_flash.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 95ee5ac..220c961 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1118,19 +1118,15 @@ int spi_flash_scan(struct spi_flash *flash) flash->read = spi_flash_cmd_read_ops; #endif - /* lock hooks are flash specific - assign them based on idcode0 */ - switch (JEDEC_MFR(info)) { #if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST) - case SPI_FLASH_CFI_MFR_STMICRO: - case SPI_FLASH_CFI_MFR_SST: + /* NOR protection support for STmicro/Micron chips and similar */ + if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_STMICRO || + JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SST) { flash->flash_lock = stm_lock; flash->flash_unlock = stm_unlock; flash->flash_is_locked = stm_is_locked; -#endif - break; - default: - debug("SF: Lock ops not supported for %02x flash\n", JEDEC_MFR(info)); } +#endif /* Compute the flash size */ flash->shift = (flash->dual_flash & SF_DUAL_PARALLEL_FLASH) ? 1 : 0;