[PATCH v2 7/8] spi: imx: defer spi initialization, if DMA engine is pending

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Anton Bondarenko <anton_bondarenko@mentor.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 7/8] spi: imx: defer spi initialization, if DMA engine is pending
Date	Fri, 25 Sep 2015 20:00:03 +0200
Message-ID	<qcFrR-8B-35@gated-at.bofh.it> (permalink)
References	<qcFrQ-8B-9@gated-at.bofh.it>
X-Original-To	<broonie@kernel.org>
X-Mailer	git-send-email 2.5.3
MIME-Version	1.0
Content-Type	text/plain
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	42
Organization	linux.* mail to news gateway
X-Original-Cc	<linux-kernel@vger.kernel.org>, <linux-spi@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <jiada_wang@mentor.com>, <muzaffar_mahmood@relay1.mentorg.com>, <vladimir_zapolskiy@mentor.com>, <b38343@freescale.com>
X-Original-Date	Fri, 25 Sep 2015 19:57:14 +0200
X-Original-Message-ID	<42b82309e539e8a5523dca5364846c472ab9dcee.1442923630.git.anton_bondarenko@mentor.com>
X-Original-References	<cover.1442923630.git.anton_bondarenko@mentor.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1232986

Show key headers only | View raw

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_zapolskiy@mentor.com>
Signed-off-by: Anton Bondarenko <anton_bondarenko@mentor.com>
---
 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 44d3cf0..1bf0739a 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1343,9 +1343,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_imx5x_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_imx5x_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.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2 7/8] spi: imx: defer spi initialization, if DMA engine is pending Anton Bondarenko <anton_bondarenko@mentor.com> - 2015-09-25 20:00 +0200

csiph-web