summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Wang <xiaoning.wang@nxp.com>2018-11-02 10:56:34 +0800
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:34:54 +0800
commitbc29ec384ee1c065822f1143a6ddcbf948683f90 (patch)
tree2f4d9c3490fca9a0dfcf4ca5c0fb5d85b99e7628
parentb4e0c934ad0ad234ad9fad76a0eca9a3d0c17d4b (diff)
MLK-20113 spi: ecspi: add pio spi slave mode for imx6ul
Add pio spi slave mode support for imx6ul which is based on the patch cherry-pick from community(71abd29057cb17b6b9532421821dc443427399ed). Because the original imx6ul is bound to mx51 in the dts file. However, in the slave mode, the patch in the community only adds two functions mx53_ecspi_rx_slave/mx53_ecspi_tx_slave. Therefore, configure mx51/6ul to use these two functions for data transmission and reception in slave mode. Acked-by: Fugang Duan <fugang.duan@nxp.com> Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
-rw-r--r--drivers/spi/spi-imx.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index e932c3494bb9..9c3902555730 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -533,7 +533,7 @@ static int mx51_ecspi_config(struct spi_device *spi)
/* set chip select to use */
ctrl |= MX51_ECSPI_CTRL_CS(spi->chip_select);
- if (spi_imx->slave_mode && is_imx53_ecspi(spi_imx))
+ if (spi_imx->slave_mode)
ctrl |= (spi_imx->slave_burst * 8 - 1)
<< MX51_ECSPI_CTRL_BL_OFFSET;
else
@@ -987,6 +987,8 @@ static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = {
.fifo_size = 64,
.has_dmamode = true,
.dynamic_burst = true,
+ .has_slavemode = true,
+ .disable = mx51_ecspi_disable,
.devtype = IMX6UL_ECSPI,
};
@@ -1186,7 +1188,7 @@ static int spi_imx_setupxfer(struct spi_device *spi,
else
spi_imx->usedma = 0;
- if (is_imx53_ecspi(spi_imx) && spi_imx->slave_mode) {
+ if (spi_imx->slave_mode) {
spi_imx->rx = mx53_ecspi_rx_slave;
spi_imx->tx = mx53_ecspi_tx_slave;
spi_imx->slave_burst = t->len;
@@ -1405,7 +1407,7 @@ static int spi_imx_pio_transfer_slave(struct spi_device *spi,
struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
int ret = transfer->len;
- if (is_imx53_ecspi(spi_imx) &&
+ if ((is_imx51_ecspi(spi_imx) || is_imx53_ecspi(spi_imx)) &&
transfer->len > MX53_MAX_TRANSFER_BYTES) {
dev_err(&spi->dev, "Transaction too big, max size is %d bytes\n",
MX53_MAX_TRANSFER_BYTES);