[U-Boot] [PATCH v3] sf_probe: Add lock ops for SST SPI NOR flash
From: Fabio Estevam fabio.estevam@freescale.com
SST SPI NOR flash has the same locking programming bits as ST Micro.
Add support for it.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com Reviewed-by: Jagan Teki jteki@openedev.com --- Changes since v2: - Add parenthesis (Jagan)
drivers/mtd/spi/sf_internal.h | 1 + drivers/mtd/spi/sf_ops.c | 4 ++-- drivers/mtd/spi/sf_probe.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 8793f18..85c8a89 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -64,6 +64,7 @@ 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
/* Erase commands */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 6cc2d31..f045471 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -583,7 +583,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, } #endif
-#ifdef CONFIG_SPI_FLASH_STMICRO +#if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST) static void stm_get_locked_range(struct spi_flash *flash, u8 sr, loff_t *ofs, u32 *len) { @@ -756,4 +756,4 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len)
return 0; } -#endif /* CONFIG_SPI_FLASH_STMICRO */ +#endif diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index bc05d30..fea6c24 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;
On 18 November 2015 at 00:20, Fabio Estevam festevam@gmail.com wrote:
From: Fabio Estevam fabio.estevam@freescale.com
SST SPI NOR flash has the same locking programming bits as ST Micro.
Add support for it.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com Reviewed-by: Jagan Teki jteki@openedev.com
Minor edit on commit message.
Applied to u-boot-spi/master
thanks!
On Tue, Nov 17, 2015 at 4:59 PM, Jagan Teki jteki@openedev.com wrote:
On 18 November 2015 at 00:20, Fabio Estevam festevam@gmail.com wrote:
From: Fabio Estevam fabio.estevam@freescale.com
SST SPI NOR flash has the same locking programming bits as ST Micro.
Add support for it.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com Reviewed-by: Jagan Teki jteki@openedev.com
Minor edit on commit message.
Not sure I understood your change. It seems to me that you changed "Add support for it" to "- added support for it."
Why did you do this?
In U-boot and kernel we should use imperative mood in the commit log.
Please check http://www.denx.de/wiki/U-Boot/Patches and also Documentation/SubmittingPatches.
On 18 November 2015 at 00:39, Fabio Estevam festevam@gmail.com wrote:
On Tue, Nov 17, 2015 at 4:59 PM, Jagan Teki jteki@openedev.com wrote:
On 18 November 2015 at 00:20, Fabio Estevam festevam@gmail.com wrote:
From: Fabio Estevam fabio.estevam@freescale.com
SST SPI NOR flash has the same locking programming bits as ST Micro.
Add support for it.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com Reviewed-by: Jagan Teki jteki@openedev.com
Minor edit on commit message.
Not sure I understood your change. It seems to me that you changed "Add support for it" to "- added support for it."
OK, well I usually use imperative on commit header than the commit body something similar to this
sf: Add lock ops support to SST flash
Added lock operations which is similar to STmicro.
Signed-off-by: Jagan Teki jteki@openedev.com
Commit header says the doing work(imperative) and commit body has done work - this notation look easy to understand.
comments?
Why did you do this?
In U-boot and kernel we should use imperative mood in the commit log.
Please check http://www.denx.de/wiki/U-Boot/Patches and also Documentation/SubmittingPatches.
thanks!
On Tue, Nov 17, 2015 at 5:15 PM, Jagan Teki jteki@openedev.com wrote:
OK, well I usually use imperative on commit header than the commit body something similar to this
sf: Add lock ops support to SST flash
Added lock operations which is similar to STmicro.
Signed-off-by: Jagan Teki jteki@openedev.com
Commit header says the doing work(imperative) and commit body has done work - this notation look easy to understand.
comments?
Haven't seen this style before. Anyway, I am glad you applied the patch ;-)
participants (2)
-
Fabio Estevam -
Jagan Teki