diff options
| author | Jagan Teki <jteki@openedev.com> | 2015-12-16 15:15:41 +0530 |
|---|---|---|
| committer | Jagan Teki <jteki@openedev.com> | 2016-01-13 18:47:26 +0530 |
| commit | e5961f07068443bf55a8a71ef04e7364583e495a (patch) | |
| tree | 9366817402e5bd045315fcfd749e15142eb3d26f | |
| parent | 43655224219d7127eb5b96934e1ff43bde13b91d (diff) | |
| download | blackbird-obmc-uboot-e5961f07068443bf55a8a71ef04e7364583e495a.tar.gz blackbird-obmc-uboot-e5961f07068443bf55a8a71ef04e7364583e495a.zip | |
spi: Rename SPI_OPM_RX_* to SPI_RX_*
SPI_OPM_RX_AS - SPI_RX_SLOW
SPI_OPM_RX_AF - SPI_RX_FAST
SPI_OPM_RX_DOUT - SPI_RX_DUAL
SPI_OPM_RX_QOF - SPI_RX_QUAD
Cc: Simon Glass <sjg@chromium.org>
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: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
| -rw-r--r-- | drivers/spi/ich.c | 2 | ||||
| -rw-r--r-- | drivers/spi/ti_qspi.c | 2 | ||||
| -rw-r--r-- | include/spi.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index d11132c99c..7f41763125 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_OPM_RX_AS; + slave->op_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 5747ed1fa9..366243cea7 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_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 | diff --git a/include/spi.h b/include/spi.h index 3e3480a717..fd095020b2 100644 --- a/include/spi.h +++ b/include/spi.h @@ -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) |
