From patchwork Sun Dec 6 18:34:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 553167 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 6387B140297 for ; Mon, 7 Dec 2015 05:36:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AC8A34B7B2; Sun, 6 Dec 2015 19:36:08 +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 zINGuMVCbv-E; Sun, 6 Dec 2015 19:36:08 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 40AEA4B72A; Sun, 6 Dec 2015 19:35:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7274C4B765 for ; Sun, 6 Dec 2015 19:35: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 qqn3V6IqUmkR for ; Sun, 6 Dec 2015 19:35: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-pa0-f67.google.com (mail-pa0-f67.google.com [209.85.220.67]) by theia.denx.de (Postfix) with ESMTPS id 0C7574B721 for ; Sun, 6 Dec 2015 19:35:47 +0100 (CET) Received: by pabfh17 with SMTP id fh17so15684620pab.3 for ; Sun, 06 Dec 2015 10:35:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RaBoXCv5EOX+oLFPVhIsTshiT4YQl9AhBOYcaQGhQsY=; b=mehi0RhvgxTmLxW6zdGnntcUmix1iRanQhvl/cL2SDWbtXaTI78CiTAcLEJxl4o6Fi 6Xu9WM1aoYIyAr0qC7segeFOYr+1DE8l9k7zmWjpyRFp2A631x7/4nJ694/j5xREDRId QMgqSKWEvLUhdlakQPEwypbzPuDOxHkSLw7CpxjM4iaE+VlRbKCRllAjVDouvfbwLeOq wuqB1GUFyU/zlCHcwEKPQgUE4a++l1cqTGU4CgVg6gvlAhMknfHN6j7wB9vY6WBPWA3Q i9I0bv5u/xk62NJHvUOYnFc7yw3M7boXyfHt7M6pdCrzM8NpnCHCVczDUuILU4T3Fut/ KgdA== X-Received: by 10.66.100.196 with SMTP id fa4mr37492152pab.21.1449426945782; Sun, 06 Dec 2015 10:35:45 -0800 (PST) Received: from localhost.localdomain ([123.236.183.133]) by smtp.gmail.com with ESMTPSA id 87sm29494345pfj.23.2015.12.06.10.35.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Dec 2015 10:35:44 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 7 Dec 2015 00:04:20 +0530 Message-Id: <1449426866-696-9-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449426866-696-1-git-send-email-jteki@openedev.com> References: <1449426866-696-1-git-send-email-jteki@openedev.com> Cc: Tom Rini , Michal Simek , Jagan Teki , Stefan Roese Subject: [U-Boot] [PATCH v8 08/14] sf: Flash power up read-only based on idcode0 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" Using macro's for flash power up read-only access code leads wrong behaviour hence use idcode0 for runtime detection, hence the flash which require this functionality gets detected at runtime. Reviewed-by: Simon Glass Signed-off-by: Jagan Teki Reviewed-by: Bin Meng --- drivers/mtd/spi/sf_internal.h | 1 + drivers/mtd/spi/sf_ops.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 8f586ee..b8692c6 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -66,6 +66,7 @@ enum spi_nor_option_flags { #define SPI_FLASH_CFI_MFR_MACRONIX 0xc2 #define SPI_FLASH_CFI_MFR_SST 0xbf #define SPI_FLASH_CFI_MFR_WINBOND 0xef +#define SPI_FLASH_CFI_MFR_ATMEL 0x1f /* Erase commands */ #define CMD_ERASE_4K 0x20 diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 853759e..e5514ab 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -941,11 +941,10 @@ int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash) } /* Flash powers up read-only, so clear BP# bits */ -#if defined(CONFIG_SPI_FLASH_ATMEL) || \ - defined(CONFIG_SPI_FLASH_MACRONIX) || \ - defined(CONFIG_SPI_FLASH_SST) + if (idcode[0] == SPI_FLASH_CFI_MFR_ATMEL || + idcode[0] == SPI_FLASH_CFI_MFR_MACRONIX || + idcode[0] == SPI_FLASH_CFI_MFR_SST) write_sr(flash, 0); -#endif /* Assign spi data */ flash->spi = spi;