From: Jagan Teki <jteki@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/8] spi: Rename op_mode_rx to mode_rx
Date: Wed, 16 Dec 2015 21:10:43 +0530 [thread overview]
Message-ID: <1450280447-3897-5-git-send-email-jteki@openedev.com> (raw)
In-Reply-To: <1450280447-3897-1-git-send-email-jteki@openedev.com>
Since spi rx mode macro's are renamed to simple and
meaninfull in below patch, this patch will rename
the respective structure member.
"spi: Rename SPI_OPM_RX_* to SPI_RX_*"
(sha1: 5e9ffbc5376616449beaaf2bc100f579f12291cf)
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>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
drivers/mtd/spi/spi_flash.c | 2 +-
drivers/spi/ich.c | 2 +-
drivers/spi/ti_qspi.c | 2 +-
include/spi.h | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 1ba6222..51f94a7 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..48a78dc 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -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
* @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;
--
1.9.1
next prev parent reply other threads:[~2015-12-16 15:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 15:40 [U-Boot] [PATCH 0/8] spi: Cleanup set Jagan Teki
2015-12-16 15:40 ` [U-Boot] [PATCH 1/8] spi: Remove SPI_OPM_RX_EXTN Jagan Teki
2015-12-21 6:27 ` Bin Meng
2015-12-16 15:40 ` [U-Boot] [PATCH 2/8] spi: Remove SPI_OPM_RX_DIO|QIOF Jagan Teki
2015-12-21 6:28 ` Bin Meng
2015-12-16 15:40 ` [U-Boot] [PATCH 3/8] spi: Rename SPI_OPM_RX_* to SPI_RX_* Jagan Teki
2015-12-21 6:28 ` Bin Meng
2015-12-16 15:40 ` Jagan Teki [this message]
2015-12-21 6:28 ` [U-Boot] [PATCH 4/8] spi: Rename op_mode_rx to mode_rx Bin Meng
2015-12-23 6:36 ` Jagan Teki
2015-12-23 7:23 ` Bin Meng
2015-12-28 12:19 ` Jagan Teki
2015-12-16 15:40 ` [U-Boot] [PATCH 5/8] spi: Move mode, mode_rx, flags macro's to structure Jagan Teki
2015-12-21 5:48 ` Bin Meng
2015-12-23 6:38 ` Jagan Teki
2015-12-16 15:40 ` [U-Boot] [PATCH 6/8] spi: Fix bit assignment with flags Jagan Teki
2015-12-21 6:28 ` Bin Meng
2015-12-16 15:40 ` [U-Boot] [PATCH 7/8] spi: Use BIT macro Jagan Teki
2015-12-21 6:28 ` Bin Meng
2015-12-16 15:40 ` [U-Boot] [PATCH 8/8] spi: Minor cleanup Jagan Teki
2015-12-21 6:28 ` Bin Meng
2015-12-17 7:14 ` [U-Boot] [PATCH 0/8] spi: Cleanup set Jagan Teki
2015-12-17 7:15 ` Jagan Teki
2015-12-17 7:28 ` Bin Meng
2015-12-23 10:02 ` Mugunthan V N
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450280447-3897-5-git-send-email-jteki@openedev.com \
--to=jteki@openedev.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.