On Sun, Nov 01, 2015 at 03:41:41PM +0100, Anton Bondarenko wrote:
> From: Anton Bondarenko <anton_bondare...@mentor.com>
>
> If SPI device supports DMA mode, but DMA controller is not yet
> available due to e.g. a delay in the corresponding kernel module
> initialization, retry to initialize SPI driver later on instead of
> falling back into PIO only mode.
>
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapols...@mentor.com>
> Signed-off-by: Anton Bondarenko <anton_bondare...@mentor.com>
Ok, so 6/7 is only part of the deferral story. Maybe squash the two
patches into one?
Sascha
> ---
> drivers/spi/spi-imx.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index 6035ddd..d2ea731 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -1354,9 +1354,15 @@ static int spi_imx_probe(struct platform_device *pdev)
> * Only validated on i.mx6 now, can remove the constrain if validated on
> * other chips.
> */
> - if (is_imx51_ecspi(spi_imx) &&
> - spi_imx_sdma_init(&pdev->dev, spi_imx, master))
> - dev_err(&pdev->dev, "dma setup error,use pio instead\n");
> + if (is_imx51_ecspi(spi_imx)) {
> + ret = spi_imx_sdma_init(&pdev->dev, spi_imx, master);
> + if (ret == -EPROBE_DEFER)
> + goto out_clk_put;
> +
> + if (ret < 0)
> + dev_err(&pdev->dev, "dma setup error %d, use pio\n",
> + ret);
> + }
>
> spi_imx->devtype_data->reset(spi_imx);
>
> --
> 2.6.2
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
