[PATCH AUTOSEL 5.14 058/252] spi: imx: fix ERR009165

[Lucas Stach]

Hi Sasha,

Am Donnerstag, dem 09.09.2021 um 07:37 -0400 schrieb Sasha Levin:
> From: Robin Gong <yibin.gong at nxp.com>
> 
> [ Upstream commit 980f884866eed4dda2a18de888c5a67dde67d640 ]
> 
> Change to XCH  mode even in dma mode, please refer to the below
> errata:
> https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf
> 

This patch is part of a quite extensive series touching multiple
drivers and devicetree descriptions and will do more harm than good if
backported without the rest of the series. The options here are:
a) backport the entire series (this will most likely not match the
stable criteria)
b) drop the patch from the stable queue

Regards,
Lucas

> Signed-off-by: Robin Gong <yibin.gong at nxp.com>
> Reviewed-by: Lucas Stach <l.stach at pengutronix.de>
> Acked-by: Mark Brown <broonie at kernel.org>
> Signed-off-by: Shawn Guo <shawnguo at kernel.org>
> Signed-off-by: Sasha Levin <sashal at kernel.org>
> ---
>  drivers/spi/spi-imx.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index fa68e9817929..d89b11205815 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -622,8 +622,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
>  	ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk);
>  	spi_imx->spi_bus_clk = clk;
>  
> -	if (spi_imx->usedma)
> -		ctrl |= MX51_ECSPI_CTRL_SMC;
> +	/* ERR009165: work in XHC mode as PIO */
> +	ctrl &= ~MX51_ECSPI_CTRL_SMC;
>  
>  	writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
>  
> @@ -637,7 +637,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx)
>  	 * and enable DMA request.
>  	 */
>  	writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) |
> -		MX51_ECSPI_DMA_TX_WML(spi_imx->wml) |
> +		MX51_ECSPI_DMA_TX_WML(0) |
>  		MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) |
>  		MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN |
>  		MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA);
> @@ -1253,10 +1253,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
>  {
>  	int ret;
>  
> -	/* use pio mode for i.mx6dl chip TKT238285 */
> -	if (of_machine_is_compatible("fsl,imx6dl"))
> -		return 0;
> -
>  	spi_imx->wml = spi_imx->devtype_data->fifo_size / 2;
>  
>  	/* Prepare for TX DMA: */