[PATCH v2 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul

[Robin Gong]

   ERR009165 fix on i.mx6ul and next chip, such as i.mx6ull/i.mx8mq/i.mx8mm.
Remove workaround on those chips. Add new i.mx6ul type for that.

Signed-off-by: Robin Gong <yibin.g...@nxp.com>
---
 drivers/spi/spi-imx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index eb56eac..2e5e978 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -57,6 +57,7 @@ enum spi_imx_devtype {
        IMX35_CSPI,     /* CSPI on all i.mx except above */
        IMX51_ECSPI,    /* ECSPI on i.mx51 */
        IMX53_ECSPI,    /* ECSPI on i.mx53 and later */
+       IMX6UL_ECSPI,   /* ERR009165 fix from i.mx6ul */
 };
 
 struct spi_imx_data;
@@ -128,7 +129,8 @@ static inline int is_imx35_cspi(struct spi_imx_data *d)
 
 static inline int is_imx51_ecspi(struct spi_imx_data *d)
 {
-       return d->devtype_data->devtype == IMX51_ECSPI;
+       return d->devtype_data->devtype == IMX51_ECSPI ||
+              d->devtype_data->devtype == IMX6UL_ECSPI;
 }
 
 static inline int is_imx53_ecspi(struct spi_imx_data *d)
@@ -585,9 +587,16 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data 
*spi_imx,
        ctrl |= mx51_ecspi_clkdiv(spi_imx, t->speed_hz, &clk);
        spi_imx->spi_bus_clk = clk;
 
-       /* ERR009165: work in XHC mode as PIO */
-       if (spi_imx->usedma)
-               ctrl &= ~MX51_ECSPI_CTRL_SMC;
+       /*
+        * ERR009165: work in XHC mode instead of SMC as PIO on the chips
+        * before i.mx6ul.
+        */
+       if (spi_imx->usedma) {
+               if (spi_imx->devtype_data->devtype == IMX6UL_ECSPI)
+                       ctrl |= MX51_ECSPI_CTRL_SMC;
+               else
+                       ctrl &= ~MX51_ECSPI_CTRL_SMC;
+       }
 
        writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
 
@@ -615,6 +624,8 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx)
 {
        u32 tx_wml = 0;
 
+       if (spi_imx->devtype_data->devtype == IMX6UL_ECSPI)
+               tx_wml = spi_imx->wml;
        /*
         * Configure the DMA register: setup the watermark
         * and enable DMA request.
@@ -1012,6 +1023,22 @@ static struct spi_imx_devtype_data 
imx53_ecspi_devtype_data = {
        .devtype = IMX53_ECSPI,
 };
 
+static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = {
+       .intctrl = mx51_ecspi_intctrl,
+       .prepare_message = mx51_ecspi_prepare_message,
+       .prepare_transfer = mx51_ecspi_prepare_transfer,
+       .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,
+       .has_slavemode = true,
+       .disable = mx51_ecspi_disable,
+       .devtype = IMX6UL_ECSPI,
+};
+
 static const struct platform_device_id spi_imx_devtype[] = {
        {
                .name = "imx1-cspi",
@@ -1035,6 +1062,9 @@ static const struct platform_device_id spi_imx_devtype[] 
= {
                .name = "imx53-ecspi",
                .driver_data = (kernel_ulong_t) &imx53_ecspi_devtype_data,
        }, {
+               .name = "imx6ul-ecspi",
+               .driver_data = (kernel_ulong_t) &imx6ul_ecspi_devtype_data,
+       }, {
                /* sentinel */
        }
 };
@@ -1047,6 +1077,7 @@ static const struct of_device_id spi_imx_dt_ids[] = {
        { .compatible = "fsl,imx35-cspi", .data = &imx35_cspi_devtype_data, },
        { .compatible = "fsl,imx51-ecspi", .data = &imx51_ecspi_devtype_data, },
        { .compatible = "fsl,imx53-ecspi", .data = &imx53_ecspi_devtype_data, },
+       { .compatible = "fsl,imx6ul-ecspi", .data = &imx6ul_ecspi_devtype_data, 
},
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, spi_imx_dt_ids);
-- 
2.7.4