From: Jagan Teki <jteki@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 16/21] sf: Flash power up read-only based on idcode0
Date: Mon, 12 Oct 2015 20:31:09 +0530 [thread overview]
Message-ID: <1444662074-2424-17-git-send-email-jteki@openedev.com> (raw)
In-Reply-To: <1444662074-2424-1-git-send-email-jteki@openedev.com>
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.
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
Changes for v4, v3, v2:
- none
drivers/mtd/spi/sf_internal.h | 2 ++
drivers/mtd/spi/sf_ops.c | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 8ef88f4..39749c2 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -64,7 +64,9 @@ enum spi_nor_option_flags {
#define SPI_FLASH_CFI_MFR_SPANSION 0x01
#define SPI_FLASH_CFI_MFR_STMICRO 0x20
#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 f63ce7a..f90f041 100644
--- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c
@@ -748,11 +748,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;
--
1.9.1
next prev parent reply other threads:[~2015-10-12 15:01 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 15:00 [U-Boot] [PATCH v4 00/21] sf: Tunning spi-flash layer Jagan Teki
2015-10-12 15:00 ` [U-Boot] [PATCH v4 01/21] spi: zynq_spi: Remove unneeded headers Jagan Teki
2015-10-25 7:32 ` Jagan Teki
2015-10-12 15:00 ` [U-Boot] [PATCH v4 02/21] sf: Return bank_sel, if flash->bank_curr == bank_sel Jagan Teki
2015-10-25 7:33 ` Jagan Teki
2015-10-12 15:00 ` [U-Boot] [PATCH v4 03/21] sf: Add spi_flash_read_bar Jagan Teki
2015-10-25 7:35 ` Jagan Teki
2015-10-12 15:00 ` [U-Boot] [PATCH v4 04/21] sf: Optimize BAR write code Jagan Teki
2015-10-25 7:36 ` Jagan Teki
2015-10-12 15:00 ` [U-Boot] [PATCH v4 05/21] sf: Make flash->flags use for generic usage Jagan Teki
2015-10-25 7:38 ` Jagan Teki
2015-11-16 2:59 ` Bin Meng
2015-11-18 1:14 ` Bin Meng
2015-11-18 1:27 ` Tom Rini
2015-11-18 6:58 ` Jagan Teki
2015-10-12 15:00 ` [U-Boot] [PATCH v4 06/21] sf: Update status reg check in spi_flash_cmd_wait_ready Jagan Teki
2015-10-25 7:39 ` Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 07/21] sf: Add FSR support to spi_flash_cmd_wait_ready Jagan Teki
2015-10-25 7:40 ` Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 08/21] sf: spi_flash_validate_params => spi_flash_scan Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 09/21] sf: Move spi_flash_scan code to sf_ops Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 10/21] sf: Move the read_id " Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 11/21] sf: Move BAR defined code at once place Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 12/21] sf: Use static for file-scope functions Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 13/21] sf: Fix Makefile Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 14/21] sf: Use simple name for register access functions Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 15/21] sf: Use flash function pointers in dm_spi_flash_ops Jagan Teki
2015-10-12 15:01 ` Jagan Teki [this message]
2015-10-12 15:01 ` [U-Boot] [PATCH v4 17/21] sf: Use static for file-scope functions Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 18/21] sf: Remove unneeded header includes Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 19/21] sf: probe: Use spi_flash_scan in dm-spi-flash Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 20/21] sf: Re-factorize spi_flash_probe_tail code Jagan Teki
2015-10-12 15:01 ` [U-Boot] [PATCH v4 21/21] dm-sf: Re-factorize spi_flash_std_probe code Jagan Teki
2015-10-18 20:27 ` [U-Boot] [PATCH v4 00/21] sf: Tunning spi-flash layer Simon Glass
2015-10-19 9:28 ` Jagan Teki
2015-10-28 18:47 ` Simon Glass
2015-10-28 19:08 ` Jagan Teki
2015-10-29 23:25 ` Simon Glass
2015-10-30 20:02 ` Jagan Teki
2015-10-30 20:30 ` Marek Vasut
2015-10-30 20:33 ` Jagan Teki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444662074-2424-17-git-send-email-jteki@openedev.com \
--to=jteki@openedev.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox