public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jagan Teki <jteki@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 02/17] sf: Simplify lock ops detection code
Date: Mon, 26 Sep 2016 01:22:50 +0530	[thread overview]
Message-ID: <1474833185-26814-3-git-send-email-jteki@openedev.com> (raw)
In-Reply-To: <1474833185-26814-1-git-send-email-jteki@openedev.com>

Simplify the flash_lock ops detection code and added
meaningful comment.

Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
 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 daa9014..b92b0bf 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -1117,19 +1117,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;
-- 
2.7.4

  parent reply	other threads:[~2016-09-25 19:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-25 19:52 [U-Boot] [PATCH v4 00/17] sf:Updates on flash detection Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 01/17] sf: Adopt flash table INFO macro from Linux Jagan Teki
2016-09-25 19:52 ` Jagan Teki [this message]
2016-09-25 19:52 ` [U-Boot] [PATCH v4 03/17] sf: sandbox: Use JEDEC_MFR|ID in id exctract Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 04/17] sf: Cleanup spi_flash_info{} Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 05/17] sf: Cleanup sf_params Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 06/17] sf: nr_sectors -> n_sectors Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 07/17] sf: Add SPI_FLASH_MAX_ID_LEN Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 08/17] sf: Increase max id length by 1 byte Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 09/17] sf: Add INFO6 flash_info macro Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 10/17] sf: params: Add S25FS256S_64K spi flash support Jagan Teki
2016-09-25 19:52 ` [U-Boot] [PATCH v4 11/17] sf: Remove legacy idcode detection code Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 12/17] sf: Remove non-meaningful comments Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 13/17] sf: Rename sf_params.c to spi_flash_ids Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 14/17] sf: ids: Use small letter's with flash name Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 15/17] sf: ids: Use small letter in ext_jedec Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 16/17] sf: Rename few local functions Jagan Teki
2016-09-25 19:53 ` [U-Boot] [PATCH v4 17/17] spi: Remove dual flash code Jagan Teki
2016-09-27  7:22 ` [U-Boot] [PATCH v4 00/17] sf:Updates on flash detection Bin Meng
2016-10-05 16:58   ` 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=1474833185-26814-3-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