public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jagan Teki <jagan@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v6 02/21] sf: Simplify lock ops detection code
Date: Wed, 16 Nov 2016 09:32:53 +0530	[thread overview]
Message-ID: <1479268992-26811-3-git-send-email-jagan@openedev.com> (raw)
In-Reply-To: <1479268992-26811-1-git-send-email-jagan@openedev.com>

Simplify the flash_lock ops detection code and added
meaningful comment.

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 <jagan@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Tested-by: Jagan Teki <jagan@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 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;
-- 
1.9.1

  parent reply	other threads:[~2016-11-16  4:02 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-16  4:02 [U-Boot] [PATCH v6 00/21] sf: Updates on flash detection Jagan Teki
2016-11-16  4:02 ` [U-Boot] [PATCH v6 01/21] sf: Adopt flash table INFO macro from Linux Jagan Teki
2016-11-16  5:23   ` Siva Durga Prasad Paladugu
2016-11-16 12:39     ` Jagan Teki
2016-11-16 12:51       ` Siva Durga Prasad Paladugu
2016-11-18  7:05       ` Siva Durga Prasad Paladugu
2016-11-17  0:29   ` york sun
2016-11-16  4:02 ` Jagan Teki [this message]
2016-11-16  5:38   ` [U-Boot] [PATCH v6 02/21] sf: Simplify lock ops detection code Siva Durga Prasad Paladugu
2016-11-16  4:02 ` [U-Boot] [PATCH v6 03/21] sf: sandbox: Use JEDEC_MFR|ID in id exctract Jagan Teki
2016-11-16  5:42   ` Siva Durga Prasad Paladugu
2016-11-16  4:02 ` [U-Boot] [PATCH v6 04/21] sf: Cleanup spi_flash_info{} Jagan Teki
2016-11-16  5:49   ` Siva Durga Prasad Paladugu
2016-11-16  4:02 ` [U-Boot] [PATCH v6 05/21] sf: nr_sectors -> n_sectors Jagan Teki
2016-11-16  5:52   ` Siva Durga Prasad Paladugu
2016-11-16  4:02 ` [U-Boot] [PATCH v6 06/21] sf: Add SPI_FLASH_MAX_ID_LEN Jagan Teki
2016-11-16  5:56   ` Siva Durga Prasad Paladugu
2016-11-16 12:42     ` Jagan Teki
2016-11-16 13:07       ` Siva Durga Prasad Paladugu
2016-11-16  4:02 ` [U-Boot] [PATCH v6 07/21] sf: Increase max id length by 1 byte Jagan Teki
2016-11-16  6:00   ` Siva Durga Prasad Paladugu
2016-11-16  6:02   ` Siva Durga Prasad Paladugu
2016-11-16  4:02 ` [U-Boot] [PATCH v6 08/21] sf: Add INFO6 flash_info macro Jagan Teki
2016-11-16  6:09   ` Siva Durga Prasad Paladugu
2016-11-16 12:24     ` Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 09/21] sf: params: Add S25FS256S_64K spi flash support Jagan Teki
2016-11-16  6:34   ` Siva Durga Prasad Paladugu
2016-11-16  4:03 ` [U-Boot] [PATCH v6 10/21] sf: Remove legacy idcode detection code Jagan Teki
2016-11-16  6:40   ` Siva Durga Prasad Paladugu
2016-11-16  4:03 ` [U-Boot] [PATCH v6 11/21] sf: Remove non-meaningful comments Jagan Teki
2016-11-16  6:42   ` Siva Durga Prasad Paladugu
2016-11-16  4:03 ` [U-Boot] [PATCH v6 12/21] sf: Rename sf_params.c to spi_flash_ids.c Jagan Teki
2016-11-16  6:44   ` Siva Durga Prasad Paladugu
2016-11-16  4:03 ` [U-Boot] [PATCH v6 13/21] sf: ids: Use small letter's with flash name Jagan Teki
2016-11-16  6:48   ` Siva Durga Prasad Paladugu
2016-11-16  4:03 ` [U-Boot] [PATCH v6 14/21] sf: ids: Use small letter in ext_jedec Jagan Teki
2016-11-16  6:50   ` Siva Durga Prasad Paladugu
2016-11-16  4:03 ` [U-Boot] [PATCH v6 15/21] sf: Rename few local functions Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 16/21] spi: Remove dual flash options/flags Jagan Teki
2016-11-16  6:57   ` Siva Durga Prasad Paladugu
2016-11-16 13:52     ` Jagan Teki
2016-11-17  6:23       ` Siva Durga Prasad Paladugu
2016-11-17  6:28         ` Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 17/21] sf: dataflash: Remove unneeded spi data Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 18/21] sf: dataflash: Move flash id detection into jedec_probe Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 19/21] sf: dataflash: Fix add_dataflash return logic Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 20/21] sf: dataflash: Minor cleanups Jagan Teki
2016-11-16  4:03 ` [U-Boot] [PATCH v6 21/21] sf: Fix s25fs512s id param table Jagan Teki
2016-11-16  7:02   ` Siva Durga Prasad Paladugu
2016-11-16 12:45     ` Jagan Teki
2016-11-16 13:04       ` Siva Durga Prasad Paladugu
2016-11-16 13:47         ` Jagan Teki
2016-11-16 18:00           ` Jagan Teki
2016-11-17  3:57           ` Vignesh R
2016-11-18 11:09 ` [U-Boot] [PATCH v6 00/21] sf: Updates on flash detection 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=1479268992-26811-3-git-send-email-jagan@openedev.com \
    --to=jagan@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