summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/spi/sf_probe.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-11-17 16:50:53 -0200
committerJagan Teki <jteki@openedev.com>2015-11-18 00:26:26 +0530
commit5168721e584e1fc104ccc3b1a027e8973a18f65b (patch)
tree087d36f2844e24a8784ddd7a661a15a163ac7f5e /drivers/mtd/spi/sf_probe.c
parent7693fb37564422b2e0ec9717deab7ca51a093f4e (diff)
downloadtalos-obmc-uboot-5168721e584e1fc104ccc3b1a027e8973a18f65b.tar.gz
talos-obmc-uboot-5168721e584e1fc104ccc3b1a027e8973a18f65b.zip
sf: Add lock ops for SST SPI NOR flash
SST SPI NOR flash has the same locking programming bits as ST Micro - added support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> [Minor change on commit message] Signed-off-by: Jagan Teki <jteki@openedev.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
Diffstat (limited to 'drivers/mtd/spi/sf_probe.c')
-rw-r--r--drivers/mtd/spi/sf_probe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index bc05d30221..52dace42ee 100644
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -184,8 +184,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode,
/* lock hooks are flash specific - assign them based on idcode0 */
switch (idcode[0]) {
-#ifdef CONFIG_SPI_FLASH_STMICRO
+#if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST)
case SPI_FLASH_CFI_MFR_STMICRO:
+ case SPI_FLASH_CFI_MFR_SST:
flash->flash_lock = stm_lock;
flash->flash_unlock = stm_unlock;
flash->flash_is_locked = stm_is_locked;
OpenPOWER on IntegriCloud