summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJagan Teki <jteki@openedev.com>2015-12-16 15:24:24 +0530
committerJagan Teki <jteki@openedev.com>2016-01-13 18:47:26 +0530
commit91292e0bee9e59f029f7d1039fe5f2914b31ea85 (patch)
tree111bc690b13de9e7f15b545c02aff7d6740bd7f2
parente5961f07068443bf55a8a71ef04e7364583e495a (diff)
downloadu-boot-imx-91292e0bee9e59f029f7d1039fe5f2914b31ea85.zip
u-boot-imx-91292e0bee9e59f029f7d1039fe5f2914b31ea85.tar.gz
u-boot-imx-91292e0bee9e59f029f7d1039fe5f2914b31ea85.tar.bz2
spi: Rename op_mode_rx to mode_rx
Since spi rx mode macro's are renamed to simple and meaninfull, this patch will rename the respective structure members. Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Tested-by: Mugunthan V N <mugunthanvnm@ti.com> Tested-by: Jagan Teki <jteki@openedev.com> Signed-off-by: Jagan Teki <jteki@openedev.com>
-rw-r--r--drivers/mtd/spi/spi_flash.c2
-rw-r--r--drivers/spi/ich.c2
-rw-r--r--drivers/spi/ti_qspi.c2
-rw-r--r--include/spi.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index e72abb9..5766c18 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -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;
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 7f41763..59eaaea 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -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;
}
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c
index 366243c..26616eb 100644
--- a/drivers/spi/ti_qspi.c
+++ b/drivers/spi/ti_qspi.c
@@ -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 |
diff --git a/include/spi.h b/include/spi.h
index fd09502..8dabc3d 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -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;