mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Anton Bondarenko <anton.bondarenko.sama@gmail.com>
To: broonie@kernel.org, b38343@freescale.com, s.hauer@pengutronix.de
Cc: 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: [PATCH v6 2/8] spi: imx: enable loopback only for ECSPI controller family
Date: Tue,  8 Dec 2015 07:43:44 +0100	[thread overview]
Message-ID: <1449557030-27525-3-git-send-email-anton.bondarenko.sama@gmail.com> (raw)
In-Reply-To: <1449557030-27525-1-git-send-email-anton.bondarenko.sama@gmail.com>

Limit SPI_LOOP mode to ECSPI controller (iMX.51, iMX53 and i.MX6) only since
there is no support in other families specific code for now.

Signed-off-by: Anton Bondarenko <anton.bondarenko.sama@gmail.com>
---
 drivers/spi/spi-imx.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 3aa33c8..17a90dc 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1140,6 +1140,9 @@ static int spi_imx_probe(struct platform_device *pdev)
 	spi_imx = spi_master_get_devdata(master);
 	spi_imx->bitbang.master = master;
 
+	spi_imx->devtype_data = of_id ? of_id->data :
+		(struct spi_imx_devtype_data *)pdev->id_entry->driver_data;
+
 	for (i = 0; i < master->num_chipselect; i++) {
 		int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
 		if (!gpio_is_valid(cs_gpio) && mxc_platform_info)
@@ -1164,14 +1167,12 @@ static int spi_imx_probe(struct platform_device *pdev)
 	spi_imx->bitbang.master->cleanup = spi_imx_cleanup;
 	spi_imx->bitbang.master->prepare_message = spi_imx_prepare_message;
 	spi_imx->bitbang.master->unprepare_message = spi_imx_unprepare_message;
-	spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH |
-					     SPI_LOOP;
+	spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+	if (is_imx51_ecspi(spi_imx))
+		spi_imx->bitbang.master->mode_bits |= SPI_LOOP;
 
 	init_completion(&spi_imx->xfer_done);
 
-	spi_imx->devtype_data = of_id ? of_id->data :
-		(struct spi_imx_devtype_data *) pdev->id_entry->driver_data;
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	spi_imx->base = devm_ioremap_resource(&pdev->dev, res);
 	if (IS_ERR(spi_imx->base)) {
-- 
2.6.3


  parent reply	other threads:[~2015-12-08  6:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-08  6:43 [PATCH v6 0/8] Improvements for SPI IMX driver for Freescale ECSPI controller, continuation Anton Bondarenko
2015-12-08  6:43 ` [PATCH v6 1/8] spi: imx: fix loopback mode setup after controller reset Anton Bondarenko
2015-12-08  6:43 ` Anton Bondarenko [this message]
2015-12-08  6:43 ` [PATCH v6 3/8] spi: imx: return error from dma channel request Anton Bondarenko
2015-12-08  6:43 ` [PATCH v6 4/8] spi: imx: defer spi initialization, if DMA engine is Anton Bondarenko
2015-12-08  6:43 ` [PATCH v6 5/8] spi: imx: allow only WML aligned transfers to use DMA Anton Bondarenko
2015-12-15 18:27   ` Mark Brown
2015-12-08  6:43 ` [PATCH v6 6/8] spi: imx: remove dead RX DMA tail handling code Anton Bondarenko
2015-12-08  6:43 ` [PATCH v6 7/8] spi: imx: replace fixed timeout with calculated Anton Bondarenko
2015-12-08  6:43 ` [PATCH v6 8/8] spi: imx: add support for all SPI word width for DMA Anton Bondarenko
2015-12-15  9:41   ` Robin Gong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449557030-27525-3-git-send-email-anton.bondarenko.sama@gmail.com \
    --to=anton.bondarenko.sama@gmail.com \
    --cc=b38343@freescale.com \
    --cc=broonie@kernel.org \
    --cc=jiada_wang@mentor.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=vladimir_zapolskiy@mentor.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®