summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gong <yibin.gong@nxp.com>2018-10-09 02:18:42 +0800
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:34:22 +0800
commit15c2358ef381f76d94689bf1ff4c896a5c846eab (patch)
tree32cc04fba842f2b32e8a5732704712b7eb34979b
parent587f7b2f05f4c873bb647ba15e902dafcbcd7a59 (diff)
MLK-19827: spi: imx: add setup_wml for i.mx6ul
Add new setup_wml() for i.mx6ul, otherwise, kernel crash triggered since no such function on i.mx6ul.This issue is brought by commit 85c124bbc1c4 ("MLK-18983-1: spi: imx: move wml setting to later than setup_transfer"). Signed-off-by: Robin Gong <yibin.gong@nxp.com>
-rw-r--r--drivers/spi/spi-imx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 6325abecb6d7..4b4f456dea42 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -900,6 +900,7 @@ static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = {
.trigger = mx51_ecspi_trigger,
.rx_available = mx51_ecspi_rx_available,
.reset = mx51_ecspi_reset,
+ .setup_wml = mx51_setup_wml,
.fifo_size = 64,
.has_dmamode = true,
.dynamic_burst = true,
@@ -1213,6 +1214,11 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
if (ret)
return ret;
+ if (!spi_imx->devtype_data->setup_wml) {
+ dev_err(spi_imx->dev, "No setup_wml()?\n");
+ return -EINVAL;
+ }
+
spi_imx->devtype_data->setup_wml(spi_imx);
/*