sf: Minor cleanup
PATCH 1/3 sf: Minor cleanup
- Tab space
- Place all read commands at one place.
- Re-arrange write commands.
--- drivers/mtd/spi/sf_internal.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/sf_internal.h +6 -6
@@ -75,12 +75,8 @@ enum spi_nor_option_flags {#define CMD_WRITE_STATUS 0x01#define CMD_PAGE_PROGRAM 0x02#define CMD_WRITE_DISABLE 0x04 -#define CMD_READ_STATUS 0x05 -#define CMD_QUAD_PAGE_PROGRAM 0x32 -#define CMD_READ_STATUS1 0x35#define CMD_WRITE_ENABLE 0x06 -#define CMD_READ_CONFIG 0x35 -#define CMD_FLAG_STATUS 0x70 +#define CMD_QUAD_PAGE_PROGRAM 0x32/* Read commands */ #define CMD_READ_ARRAY_SLOW 0x03
@@ -90,6 +86,10 @@ enum spi_nor_option_flags {#define CMD_READ_QUAD_OUTPUT_FAST 0x6b#define CMD_READ_QUAD_IO_FAST 0xeb#define CMD_READ_ID 0x9f +#define CMD_READ_STATUS 0x05 +#define CMD_READ_STATUS1 0x35 +#define CMD_READ_CONFIG 0x35 +#define CMD_FLAG_STATUS 0x70/* Bank addr access commands */ #ifdef CONFIG_SPI_FLASH_BAR
@@ -102,7 +102,7 @@ enum spi_nor_option_flags {/* Common status */ #define STATUS_WIP (1 << 0)#define STATUS_QEB_WINSPAN (1 << 1) -#define STATUS_QEB_MXIC (1 << 6) +#define STATUS_QEB_MXIC (1 << 6)#define STATUS_PEC (1 << 7)#define SR_BP0 BIT(2)/* Block protect 0 */ #define SR_BP1 BIT(3)/* Block protect 1 */
Signature · 1 line
1.9.1
PATCH 2/3 sf: Use BIT macro
Used BIT macro like 1 << nr as BIT(nr) where nr is 0...n
--- drivers/mtd/spi/sf_internal.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/mtd/spi/sf_internal.h +21 -21
@@ -16,18 +16,18 @@/* Dual SPI flash memories - see SPI_COMM_DUAL_... */ enum spi_dual_flash {SF_SINGLE_FLASH =0 , -SF_DUAL_STACKED_FLASH =1 <<0 , -SF_DUAL_PARALLEL_FLASH =1 <<1 , +SF_DUAL_STACKED_FLASH =BIT (0 ), +SF_DUAL_PARALLEL_FLASH =BIT (1 ), };/* Enum list - Full read commands */ enum spi_read_cmds { -ARRAY_SLOW =1 <<0 , -ARRAY_FAST =1 <<1 , -DUAL_OUTPUT_FAST =1 <<2 , -DUAL_IO_FAST =1 <<3 , -QUAD_OUTPUT_FAST =1 <<4 , -QUAD_IO_FAST =1 <<5 , +ARRAY_SLOW =BIT (0 ), +ARRAY_FAST =BIT (1 ), +DUAL_OUTPUT_FAST =BIT (2 ), +DUAL_IO_FAST =BIT (3 ), +QUAD_OUTPUT_FAST =BIT (4 ), +QUAD_IO_FAST =BIT (5 ), };/* Normal - Extended - Full command set */
@@ -37,20 +37,20 @@ enum spi_read_cmds {/* sf param flags */ enum { -#ifdef CONFIG_SPI_FLASH_USE_4K_SECTORS -SECT_4K =1 <<0 , +#ifndef CONFIG_SPI_FLASH_USE_4K_SECTORS +SECT_4K =0 ,#else -SECT_4K =0 <<0 , +SECT_4K =BIT (0 ),#endif -SECT_32K =1 <<1 , -E_FSR =1 <<2 , -SST_WR =1 <<3 , -WR_QPP =1 <<4 , +SECT_32K =BIT (1 ), +E_FSR =BIT (2 ), +SST_WR =BIT (3 ), +WR_QPP =BIT (4 ), };enum spi_nor_option_flags { -SNOR_F_SST_WR = (1 <<0 ), -SNOR_F_USE_FSR = (1 <<1 ), +SNOR_F_SST_WR =BIT (0 ), +SNOR_F_USE_FSR =BIT (1 ), };#define SPI_FLASH_3B_ADDR_LEN 3
@@ -100,10 +100,10 @@ enum spi_nor_option_flags {#endif /* Common status */ -#define STATUS_WIP (1 << 0) -#define STATUS_QEB_WINSPAN (1 << 1) -#define STATUS_QEB_MXIC (1 << 6) -#define STATUS_PEC (1 << 7) +#define STATUS_WIP BIT(0) +#define STATUS_QEB_WINSPAN BIT(1) +#define STATUS_QEB_MXIC BIT(6) +#define STATUS_PEC BIT(7)#define SR_BP0 BIT(2)/* Block protect 0 */ #define SR_BP1 BIT(3)/* Block protect 1 */ #define SR_BP2 BIT(4)/* Block protect 2 */
Signature · 1 line
1.9.1
PATCH 2/3 sf: Use BIT macro
Quoted 5 lines · Jagan Teki
Used BIT macro like 1 << nr as BIT(nr) where nr is 0...n
Cc Bin Meng <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
PATCH 2/3 sf: Use BIT macro
Quoted 8 lines · Bin Meng
Quoted 5 lines · Jagan Teki
Used BIT macro like 1 << nr as BIT(nr) where nr is 0...n
Cc Bin Meng <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Reviewed-by Bin Meng <[email protected]>
Applied to u-boot-spi/master
thanks!
Signature · 1 line
Jagan.
PATCH 3/3 sf: Fix quad bit set for micron devices
In reply to Jagan TekiSetting up quad bit for micron devices need to do the same way as other flash devices like spansion, winbond etc does using enhanced volatile config register so this patch adds this support instead of printing "QEB is volatile"
--- drivers/mtd/spi/sf_internal.h | 3 ++ drivers/mtd/spi/spi_flash.c | 66 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 2 deletions(-)
drivers/mtd/spi/sf_internal.h +3 -0
@@ -77,6 +77,7 @@ enum spi_nor_option_flags {#define CMD_WRITE_DISABLE 0x04#define CMD_WRITE_ENABLE 0x06#define CMD_QUAD_PAGE_PROGRAM 0x32 +#define CMD_WRITE_EVCR 0x61/* Read commands */ #define CMD_READ_ARRAY_SLOW 0x03
@@ -90,6 +91,7 @@ enum spi_nor_option_flags {#define CMD_READ_STATUS1 0x35#define CMD_READ_CONFIG 0x35#define CMD_FLAG_STATUS 0x70 +#define CMD_READ_EVCR 0x65/* Bank addr access commands */ #ifdef CONFIG_SPI_FLASH_BAR
@@ -104,6 +106,7 @@ enum spi_nor_option_flags {#define STATUS_QEB_WINSPAN BIT(1)#define STATUS_QEB_MXIC BIT(6)#define STATUS_PEC BIT(7) +#define STATUS_QEB_MICRON BIT(7)#define SR_BP0 BIT(2)/* Block protect 0 */ #define SR_BP1 BIT(3)/* Block protect 1 */ #define SR_BP2 BIT(4)/* Block protect 2 */
drivers/mtd/spi/spi_flash.c +64 -2
84 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 1/3 sf: Minor cleanup
In reply to Jagan TekiQuoted 7 lines · Jagan Teki
- Tab space
- Place all read commands at one place.
- Re-arrange write commands.Cc Bin Meng <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
PATCH 1/3 sf: Minor cleanup
Quoted 10 lines · Bin Meng
Quoted 7 lines · Jagan Teki
- Tab space
- Place all read commands at one place.
- Re-arrange write commands.Cc Bin Meng <[email protected]>Signed-off-by Jagan Teki <[email protected]>---
Reviewed-by Bin Meng <[email protected]>
Applied to u-boot-spi/master
thanks!
Signature · 1 line
Jagan.