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>

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index d11132c99c0430f534fc8fec8a933653f20c8b51..7f417631250ff11c1bd661843c76347f6746e811 100644 (file)
--- 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 5747ed1fa97213718579b4c1cebddc8b421743e6..366243cea7aecd5b0a380f5043c77312b4bf0248 100644 (file)
--- 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 3e3480a7177768dbc143164730e5e7e24e2d9721..fd095020b29af1e8867f2e1f711baf2a87bbabfb 100644 (file)
--- 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)