From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161141AbbKEI7c (ORCPT ); Thu, 5 Nov 2015 03:59:32 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:58811 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032923AbbKEI7a (ORCPT ); Thu, 5 Nov 2015 03:59:30 -0500 Date: Thu, 5 Nov 2015 09:59:26 +0100 From: Sascha Hauer To: Anton Bondarenko Cc: broonie@kernel.org, b38343@freescale.com, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, vladimir_zapolskiy@mentor.com, jiada_wang@mentor.com Subject: Re: [PATCH v3 7/7] spi: imx: defer spi initialization, if DMA engine is pending Message-ID: <20151105085926.GK8526@pengutronix.de> References: <1446388901-6073-1-git-send-email-anton.bondarenko.sama@gmail.com> <1446388901-6073-8-git-send-email-anton.bondarenko.sama@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1446388901-6073-8-git-send-email-anton.bondarenko.sama@gmail.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 09:58:07 up 18 days, 17:37, 58 users, load average: 0.91, 0.73, 0.38 User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Nov 01, 2015 at 03:41:41PM +0100, Anton Bondarenko wrote: > From: Anton Bondarenko > > 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 > Signed-off-by: Anton Bondarenko 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 |