spi: Cleanup set
Subsystems (2)
v2 cover spi: Cleanup set
Cleanup set on spi_slave{}
Changes for v2:
- Replaced mode, mode_rx out-of structure members position
- Added SPI_TX_DUAL patch
Jagan Teki (10):
spi: Remove SPI_OPM_RX_EXTN
spi: Remove SPI_OPM_RX_DIO|QIOF
spi: Rename SPI_OPM_RX_* to SPI_RX_*
spi: Rename op_mode_rx to mode_rx
spi: Move flags macro's to spi_slave{} members
spi: Fix bit assignment with flags
spi: Use BIT macro
spi: Minor cleanup
sf: Make IO modes at last in read modes
spi: Add SPI_TX_DUAL mode
drivers/mtd/spi/sf_internal.h | 4 +-- drivers/mtd/spi/spi_flash.c | 4 +-- drivers/spi/ich.c | 2 +- drivers/spi/ti_qspi.c | 2 +- include/spi.h | 65 ++++++++++++++++++++----------------------- 5 files changed, 36 insertions(+), 41 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/10 spi: Remove SPI_OPM_RX_EXTN
SPI_OPM_RX_EXTN is a combination of all rx opmode's and spi driver shall use any one of the rx mode at a time not the combination and it is true in case of flash where spi_flash_table mention combination of supported read opmodes so-that the required one will pick based on the rx mode from spi driver.
--- include/spi.h | 3 --- 1 file changed, 3 deletions(-)
include/spi.h +0 -3
@@ -41,9 +41,6 @@#define SPI_OPM_RX_DIO (1 << 3)#define SPI_OPM_RX_QOF (1 << 4)#define SPI_OPM_RX_QIOF (1 << 5) -#define SPI_OPM_RX_EXTN (SPI_OPM_RX_AS | SPI_OPM_RX_AF | SPI_OPM_RX_DOUT | \ - SPI_OPM_RX_DIO | SPI_OPM_RX_QOF | \ - SPI_OPM_RX_QIOF)/* SPI bus connection options - see enum spi_dual_flash */ #define SPI_CONN_DUAL_SHARED (1 << 0)
Signature · 1 line
1.9.1
PATCH v2 2/10 spi: Remove SPI_OPM_RX_DIO|QIOF
In reply to Jagan TekiSPI_OPM_RX_DIO and SPI_OPM_RX_QIOF are rx IO commands/opmodes for dual and quad. Usually IO operation's are referred to flash protocol rather with spi controller protocol, these are still present in flash side for the usage of spi-nor controllers.
--- include/spi.h | 2 -- 1 file changed, 2 deletions(-)
include/spi.h +0 -2
@@ -38,9 +38,7 @@#define SPI_OPM_RX_AS (1 << 0)#define SPI_OPM_RX_AF (1 << 1)#define SPI_OPM_RX_DOUT (1 << 2) -#define SPI_OPM_RX_DIO (1 << 3)#define SPI_OPM_RX_QOF (1 << 4) -#define SPI_OPM_RX_QIOF (1 << 5)/* SPI bus connection options - see enum spi_dual_flash */ #define SPI_CONN_DUAL_SHARED (1 << 0)
Signature · 1 line
1.9.1
PATCH v2 3/10 spi: Rename SPI_OPM_RX_* to SPI_RX_*
In reply to Jagan TekiSPI_OPM_RX_AS - SPI_RX_SLOWSPI_OPM_RX_AF - SPI_RX_FASTSPI_OPM_RX_DOUT - SPI_RX_DUALSPI_OPM_RX_QOF - SPI_RX_QUAD
--- drivers/spi/ich.c | 2 +- drivers/spi/ti_qspi.c | 2 +- include/spi.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/spi/ich.c +1 -1
@@ -752,7 +752,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)* and byte program command for SST flash */ if (plat->ich_version ==7 ) { - slave->op_mode_rx =SPI_OPM_RX_AS ; + slave->op_mode_rx =SPI_RX_SLOW ; slave->mode =SPI_TX_BYTE ; }
drivers/spi/ti_qspi.c +1 -1
@@ -115,7 +115,7 @@ static void ti_spi_setup_spi_register(struct ti_qspi_slave *qslave)QSPI_SETUP0_NUM_D_BYTES_8_BITS |QSPI_SETUP0_READ_QUAD |QSPI_CMD_WRITE | QSPI_NUM_DUMMY_BITS); - slave->op_mode_rx =SPI_OPM_RX_QOF ; + slave->op_mode_rx =SPI_RX_QUAD ;#else memval |=QSPI_CMD_READ |QSPI_SETUP0_NUM_A_BYTES | QSPI_SETUP0_NUM_D_BYTES_NO_BITS |
include/spi.h +4 -4
@@ -35,10 +35,10 @@#define SPI_XFER_U_PAGE (1 << 5)/* SPI RX operation modes */ -#define SPI_OPM_RX_AS (1 << 0) -#define SPI_OPM_RX_AF (1 << 1) -#define SPI_OPM_RX_DOUT (1 << 2) -#define SPI_OPM_RX_QOF (1 << 4) +#define SPI_RX_SLOW (1 << 0) +#define SPI_RX_FAST (1 << 1) +#define SPI_RX_DUAL (1 << 2) +#define SPI_RX_QUAD (1 << 4)/* SPI bus connection options - see enum spi_dual_flash */ #define SPI_CONN_DUAL_SHARED (1 << 0)
Signature · 1 line
1.9.1
PATCH v2 4/10 spi: Rename op_mode_rx to mode_rx
In reply to Jagan TekiSince spi rx mode macro's are renamed to simple and meaninfull, this patch will rename the respective structure members.
--- drivers/mtd/spi/spi_flash.c | 2 +- drivers/spi/ich.c | 2 +- drivers/spi/ti_qspi.c | 2 +- include/spi.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/spi/spi_flash.c +1 -1
@@ -1098,7 +1098,7 @@ int spi_flash_scan(struct spi_flash *flash) flash->sector_size = flash->erase_size;/* Look for the fastest read cmd */ - cmd =fls (params->e_rd_cmd & spi->op_mode_rx); + cmd =fls (params->e_rd_cmd & spi->mode_rx);if (cmd) { cmd = spi_read_cmds_array[cmd -1 ]; flash->read_cmd = cmd;
drivers/spi/ich.c +1 -1
@@ -752,7 +752,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)* and byte program command for SST flash */ if (plat->ich_version ==7 ) { - slave->op_mode_rx =SPI_RX_SLOW ; + slave->mode_rx =SPI_RX_SLOW ; slave->mode =SPI_TX_BYTE ; }
drivers/spi/ti_qspi.c +1 -1
@@ -115,7 +115,7 @@ static void ti_spi_setup_spi_register(struct ti_qspi_slave *qslave)QSPI_SETUP0_NUM_D_BYTES_8_BITS |QSPI_SETUP0_READ_QUAD |QSPI_CMD_WRITE | QSPI_NUM_DUMMY_BITS); - slave->op_mode_rx =SPI_RX_QUAD ; + slave->mode_rx =SPI_RX_QUAD ;#else memval |=QSPI_CMD_READ |QSPI_SETUP0_NUM_A_BYTES | QSPI_SETUP0_NUM_D_BYTES_NO_BITS |
include/spi.h +3 -3
@@ -34,7 +34,7 @@#define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END)#define SPI_XFER_U_PAGE (1 << 5) -/* SPI RX operation modes */ +/* SPI mode_rx flags */ #define SPI_RX_SLOW (1 << 0)#define SPI_RX_FAST (1 << 1)#define SPI_RX_DUAL (1 << 2)
@@ -99,7 +99,7 @@ struct dm_spi_slave_platdata {* bus (bus->seq) so does not need to be stored * @cs: ID of the chip select connected to the slave. * @mode: SPI mode to use for this slave (see SPI mode flags) -* @op_mode_rx: SPI RX operation mode. +* @mode_rx: SPI RX mode to use for this slave (see SPI mode_rx flags) * @wordlen: Size of SPI word in number of bits * @max_write_size: If non-zero, the maximum number of bytes which can * be written at once, excluding command bytes.
@@ -117,7 +117,7 @@ struct spi_slave {unsigned int cs;#endif uint mode; -u8 op_mode_rx; +u8 mode_rx;unsigned int wordlen;unsigned int max_write_size;void *memory_map;
Signature · 1 line
1.9.1
PATCH v2 5/10 spi: Move flags macro's to spi_slave{} members
In reply to Jagan TekiThis patch moves flags macro's to respective member position on spi_slave{}, for better readabilty and finding the respective member macro's easily.
--- include/spi.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
include/spi.h +7 -8
@@ -26,14 +26,6 @@#define SPI_TX_BYTE 0x100/* transmit with 1 wire byte */ #define SPI_TX_QUAD 0x200/* transmit with 4 wires */ -/* SPI transfer flags */ -#define SPI_XFER_BEGIN 0x01/* Assert CS before transfer */ -#define SPI_XFER_END 0x02/* Deassert CS after transfer */ -#define SPI_XFER_MMAP 0x08/* Memory Mapped start */ -#define SPI_XFER_MMAP_END 0x10/* Memory Mapped End */ -#define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) -#define SPI_XFER_U_PAGE (1 << 5) -/* SPI mode_rx flags */ #define SPI_RX_SLOW (1 << 0)#define SPI_RX_FAST (1 << 1)
@@ -122,7 +114,14 @@ struct spi_slave {unsigned int max_write_size;void *memory_map;u8 option; +u8 flags; +#define SPI_XFER_BEGIN 0x01/* Assert CS before transfer */ +#define SPI_XFER_END 0x02/* Deassert CS after transfer */ +#define SPI_XFER_MMAP 0x08/* Memory Mapped start */ +#define SPI_XFER_MMAP_END 0x10/* Memory Mapped End */ +#define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) +#define SPI_XFER_U_PAGE (1 << 5) };/**
Signature · 1 line
1.9.1
PATCH v2 6/10 spi: Fix bit assignment with flags
In reply to Jagan TekiFixed bit assignment with flags members on spi_slave{}
--- include/spi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/spi.h +3 -3
@@ -118,10 +118,10 @@ struct spi_slave {u8 flags;#define SPI_XFER_BEGIN 0x01/* Assert CS before transfer */ #define SPI_XFER_END 0x02/* Deassert CS after transfer */ -#define SPI_XFER_MMAP 0x08/* Memory Mapped start */ -#define SPI_XFER_MMAP_END 0x10/* Memory Mapped End */ #define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) -#define SPI_XFER_U_PAGE (1 << 5) +#define SPI_XFER_MMAP 0x04/* Memory Mapped start */ +#define SPI_XFER_MMAP_END 0x08/* Memory Mapped End */ +#define SPI_XFER_U_PAGE 0x10 };/**
Signature · 1 line
1.9.1
PATCH v2 7/10 spi: Use BIT macro
In reply to Jagan TekiUsed BIT macro like 1 << nr as BIT(nr) where nr is 0...n
--- include/spi.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
include/spi.h +19 -19
@@ -11,26 +11,26 @@#define _SPI_H_/* SPI mode flags */ -#define SPI_CPHA 0x01/* clock phase */ -#define SPI_CPOL 0x02/* clock polarity */ +#define SPI_CPHA BIT(0)/* clock phase */ +#define SPI_CPOL BIT(1)/* clock polarity */ #define SPI_MODE_0 (0|0)/* (original MicroWire) */ #define SPI_MODE_1 (0|SPI_CPHA)#define SPI_MODE_2 (SPI_CPOL|0)#define SPI_MODE_3 (SPI_CPOL|SPI_CPHA) -#define SPI_CS_HIGH 0x04/* CS active high */ -#define SPI_LSB_FIRST 0x08/* per-word bits-on-wire */ -#define SPI_3WIRE 0x10/* SI/SO signals shared */ -#define SPI_LOOP 0x20/* loopback mode */ -#define SPI_SLAVE 0x40/* slave mode */ -#define SPI_PREAMBLE 0x80/* Skip preamble bytes */ -#define SPI_TX_BYTE 0x100/* transmit with 1 wire byte */ -#define SPI_TX_QUAD 0x200/* transmit with 4 wires */ +#define SPI_CS_HIGH BIT(2)/* CS active high */ +#define SPI_LSB_FIRST BIT(3)/* per-word bits-on-wire */ +#define SPI_3WIRE BIT(4)/* SI/SO signals shared */ +#define SPI_LOOP BIT(5)/* loopback mode */ +#define SPI_SLAVE BIT(6)/* slave mode */ +#define SPI_PREAMBLE BIT(7)/* Skip preamble bytes */ +#define SPI_TX_BYTE BIT(8)/* transmit with 1 wire byte */ +#define SPI_TX_QUAD BIT(9)/* transmit with 4 wires */ /* SPI mode_rx flags */ -#define SPI_RX_SLOW (1 << 0) -#define SPI_RX_FAST (1 << 1) -#define SPI_RX_DUAL (1 << 2) -#define SPI_RX_QUAD (1 << 4) +#define SPI_RX_SLOW BIT(0) +#define SPI_RX_FAST BIT(1) +#define SPI_RX_DUAL BIT(2) +#define SPI_RX_QUAD BIT(4)/* SPI bus connection options - see enum spi_dual_flash */ #define SPI_CONN_DUAL_SHARED (1 << 0)
@@ -116,12 +116,12 @@ struct spi_slave {u8 option;u8 flags; -#define SPI_XFER_BEGIN 0x01/* Assert CS before transfer */ -#define SPI_XFER_END 0x02/* Deassert CS after transfer */ +#define SPI_XFER_BEGIN BIT(0)/* Assert CS before transfer */ +#define SPI_XFER_END BIT(1)/* Deassert CS after transfer */ #define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) -#define SPI_XFER_MMAP 0x04/* Memory Mapped start */ -#define SPI_XFER_MMAP_END 0x08/* Memory Mapped End */ -#define SPI_XFER_U_PAGE 0x10 +#define SPI_XFER_MMAP BIT(2)/* Memory Mapped start */ +#define SPI_XFER_MMAP_END BIT(3)/* Memory Mapped End */ +#define SPI_XFER_U_PAGE BIT(4) };/**
Signature · 1 line
1.9.1
PATCH v2 8/10 spi: Minor cleanup
In reply to Jagan Teki- Add comments on mode_rx
- Tab space's
--- include/spi.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
include/spi.h +16 -16
@@ -11,26 +11,26 @@#define _SPI_H_/* SPI mode flags */ -#define SPI_CPHA BIT(0)/* clock phase */ -#define SPI_CPOL BIT(1)/* clock polarity */ -#define SPI_MODE_0 (0|0)/* (original MicroWire) */ -#define SPI_MODE_1 (0|SPI_CPHA) -#define SPI_MODE_2 (SPI_CPOL|0) -#define SPI_MODE_3 (SPI_CPOL|SPI_CPHA) -#define SPI_CS_HIGH BIT(2)/* CS active high */ -#define SPI_LSB_FIRST BIT(3)/* per-word bits-on-wire */ -#define SPI_3WIRE BIT(4)/* SI/SO signals shared */ -#define SPI_LOOP BIT(5)/* loopback mode */ -#define SPI_SLAVE BIT(6)/* slave mode */ -#define SPI_PREAMBLE BIT(7)/* Skip preamble bytes */ +#define SPI_CPHA BIT(0)/* clock phase */ +#define SPI_CPOL BIT(1)/* clock polarity */ +#define SPI_MODE_0 (0|0)/* (original MicroWire) */ +#define SPI_MODE_1 (0|SPI_CPHA) +#define SPI_MODE_2 (SPI_CPOL|0) +#define SPI_MODE_3 (SPI_CPOL|SPI_CPHA) +#define SPI_CS_HIGH BIT(2)/* CS active high */ +#define SPI_LSB_FIRST BIT(3)/* per-word bits-on-wire */ +#define SPI_3WIRE BIT(4)/* SI/SO signals shared */ +#define SPI_LOOP BIT(5)/* loopback mode */ +#define SPI_SLAVE BIT(6)/* slave mode */ +#define SPI_PREAMBLE BIT(7)/* Skip preamble bytes */ #define SPI_TX_BYTE BIT(8)/* transmit with 1 wire byte */ #define SPI_TX_QUAD BIT(9)/* transmit with 4 wires */ /* SPI mode_rx flags */ -#define SPI_RX_SLOW BIT(0) -#define SPI_RX_FAST BIT(1) -#define SPI_RX_DUAL BIT(2) -#define SPI_RX_QUAD BIT(4) +#define SPI_RX_SLOW BIT(0)/* receive with 1 wire slow */ +#define SPI_RX_FAST BIT(1)/* receive with 1 wire fast */ +#define SPI_RX_DUAL BIT(2)/* receive with 2 wires */ +#define SPI_RX_QUAD BIT(4)/* receive with 4 wires */ /* SPI bus connection options - see enum spi_dual_flash */ #define SPI_CONN_DUAL_SHARED (1 << 0)
Signature · 1 line
1.9.1
PATCH v2 9/10 sf: Make IO modes at last in read modes
In reply to Jagan TekiSLOW, FAST, DUAL, DUAL_IO, QUAD, QUAD_IO changed order to SLOW, FAST, DUAL, QUAD, DUAL_IO, QUAD_IO
--- drivers/mtd/spi/sf_internal.h | 4 ++-- drivers/mtd/spi/spi_flash.c | 2 +- include/spi.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/spi/sf_internal.h +2 -2
@@ -25,8 +25,8 @@ enum spi_read_cmds {ARRAY_SLOW =BIT (0 ),ARRAY_FAST =BIT (1 ),DUAL_OUTPUT_FAST =BIT (2 ), -DUAL_IO_FAST =BIT (3 ), -QUAD_OUTPUT_FAST =BIT (4 ), +QUAD_OUTPUT_FAST =BIT (3 ), +DUAL_IO_FAST =BIT (4 ), QUAD_IO_FAST = BIT(5), };
drivers/mtd/spi/spi_flash.c +1 -1
@@ -975,8 +975,8 @@ int spi_flash_scan(struct spi_flash *flash)CMD_READ_ARRAY_SLOW ,CMD_READ_ARRAY_FAST ,CMD_READ_DUAL_OUTPUT_FAST , -CMD_READ_DUAL_IO_FAST ,CMD_READ_QUAD_OUTPUT_FAST , +CMD_READ_DUAL_IO_FAST , CMD_READ_QUAD_IO_FAST };/* Read the ID codes */
include/spi.h +1 -1
@@ -30,7 +30,7 @@#define SPI_RX_SLOW BIT(0)/* receive with 1 wire slow */ #define SPI_RX_FAST BIT(1)/* receive with 1 wire fast */ #define SPI_RX_DUAL BIT(2)/* receive with 2 wires */ -#define SPI_RX_QUAD BIT(4)/* receive with 4 wires */ +#define SPI_RX_QUAD BIT(3)/* receive with 4 wires */ /* SPI bus connection options - see enum spi_dual_flash */ #define SPI_CONN_DUAL_SHARED (1 << 0)
Signature · 1 line
1.9.1
PATCH v2 9/10 sf: Make IO modes at last in read modes
Quoted 9 lines · Jagan Teki
SLOW, FAST, DUAL,
DUAL_IO, QUAD,QUAD_IOchanged order to SLOW, FAST, DUAL, QUAD,DUAL_IO,QUAD_IOCc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>Cc Michal Simek <[email protected]>Cc Siva Durga Prasad Paladugu <[email protected]>Tested-by Jagan Teki <[email protected]>Signed-off-by Jagan Teki <[email protected]>
Quoted 6 lines
--- drivers/mtd/spi/sf_internal.h | 4 ++-- drivers/mtd/spi/spi_flash.c | 2 +- include/spi.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
v2 cover spi: Cleanup set
In reply to Jagan TekiQuoted 6 lines · Jagan Teki
Cleanup set on spi_slave{}
Changes for v2:
- Replaced mode,mode_rxout-of structure members position
- AddedSPI_TX_DUALpatch
Quoted 11 lines
Jagan Teki (10):
spi: RemoveSPI_OPM_RX_EXTN
spi: Remove SPI_OPM_RX_DIO|QIOF
spi: Rename SPI_OPM_RX_* to SPI_RX_*
spi: Renameop_mode_rxtomode_rx
spi: Move flags macro's to spi_slave{} members
spi: Fix bit assignment with flags
spi: Use BIT macro
spi: Minor cleanup
sf: Make IO modes at last in read modes
spi: AddSPI_TX_DUALmode
Applied to u-boot-spi/master
thanks!
Signature · 1 line
Jagan.