[PATCH v6 3/3] spi: sun4i: Add support for wait time between word transmissions

Path	csiph.com!goblin2!goblin.stu.neva.ru!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Marcus Weseloh <mweseloh42@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH v6 3/3] spi: sun4i: Add support for wait time between word transmissions
Date	Sat, 26 Dec 2015 17:00:02 +0100
Message-ID	<qJZqa-2N6-29@gated-at.bofh.it> (permalink)
References	<qJZqa-2N6-17@gated-at.bofh.it>
X-Original-To	linux-sunxi@googlegroups.com
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hVwBo5ZV27Ed70glOFjaFMNil/jEY3SQRZzt18zhbxY=; b=KVw4uwBFOM3FiEW37A/+lEiVMpMBsh3dWf9K7YlDIXACgkLD0hEebUSv2ejcFcWwG/ Qual1C8AHYBqft9rgjPUOqymMUOuJ0QttuHxx87emCm1EydIcGXJInUM4IbdtPMUaNNs Rg49+4oCvxfrR94hl7FJ63XTIFiTmqSSHO1ewmk5iqxH4isKGjxQ9o/HyDxv4gJCP7UM 18Yi364iZKDDoPixtmXBor4n2OzkaYYn7q+iQ53js3I1WbGcA4TMLXRXS1AGXYpT8LZQ 5p5iNhseBveUnk+2dmfnBmIC0/0hlCTme8LLyMp1q93NUAsES0/xB2jQmRXPb8fRIsxu 47Nw==
X-Received	by 10.194.85.229 with SMTP id k5mr55816694wjz.100.1451145206774; Sat, 26 Dec 2015 07:53:26 -0800 (PST)
X-Mailer	git-send-email 1.9.1
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	67
Organization	linux.* mail to news gateway
X-Original-Cc	Chen-Yu Tsai <wens@csie.org>, devicetree@vger.kernel.org, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Marcus Weseloh <mweseloh42@gmail.com>, Mark Brown <broonie@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Maxime Ripard <maxime.ripard@free-electrons.com>, Pawel Moll <pawel.moll@arm.com>, Rob Herring <robh+dt@kernel.org>
X-Original-Date	Sat, 26 Dec 2015 16:53:06 +0100
X-Original-Message-ID	<1451145186-14235-4-git-send-email-mweseloh42@gmail.com>
X-Original-References	<1451145186-14235-1-git-send-email-mweseloh42@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1298229

Show key headers only | View raw

Modifies the sun4i SPI master driver to make use of the
"spi-word-wait-ns" property. This specific SPI controller needs 3 clock
cycles to set up the delay, which makes the minimum non-zero wait time
on this hardware 4 clock cycles.

Signed-off-by: Marcus Weseloh <mweseloh42@gmail.com>
---
 drivers/spi/spi-sun4i.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
index d67e142..4d6f77c 100644
--- a/drivers/spi/spi-sun4i.c
+++ b/drivers/spi/spi-sun4i.c
@@ -176,6 +176,9 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
 	unsigned int tx_len = 0;
 	int ret = 0;
 	u32 reg;
+	int wait_clk = 0;
+	int clk_ns = 0;
+	unsigned int speed_hz;
 
 	/* We don't support transfer larger than the FIFO */
 	if (tfr->len > SUN4I_FIFO_DEPTH)
@@ -260,13 +263,34 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
 	div = DIV_ROUND_UP(mclk_rate, 2 * tfr->speed_hz) - 1;
 	if (div <= SUN4I_CLK_CTL_CDR2_MASK) {
 		reg = SUN4I_CLK_CTL_CDR2(div) | SUN4I_CLK_CTL_DRS;
+		speed_hz = mclk_rate / (2 * (div + 1));
 	} else {
 		div = ilog2(roundup_pow_of_two(mclk_rate / tfr->speed_hz));
 		reg = SUN4I_CLK_CTL_CDR1(div);
+		speed_hz = mclk_rate / (1 << div);
 	}
 
 	sun4i_spi_write(sspi, SUN4I_CLK_CTL_REG, reg);
 
+	/*
+	 * Setup wait time between words.
+	 *
+	 * Wait time is set in SPI_CLK cycles. The SPI hardware needs 3
+	 * additional cycles to setup the wait counter, so the minimum delay
+	 * time is 4 cycles.
+	 */
+	if (spi->word_wait_ns) {
+		clk_ns = DIV_ROUND_UP(1000000000, speed_hz);
+		wait_clk = DIV_ROUND_UP(spi->word_wait_ns, clk_ns) - 3;
+		if (wait_clk < 1) {
+			wait_clk = 1;
+			dev_dbg(&spi->dev,
+				"using minimum of 4 word wait cycles (%uns)",
+				4 * clk_ns);
+		}
+	}
+	sun4i_spi_write(sspi, SUN4I_WAIT_REG, (u16)wait_clk);
+
 	/* Setup the transfer now... */
 	if (sspi->tx_buf)
 		tx_len = tfr->len;
-- 
1.9.1

--
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/

Thread

[PATCH v6 0/3] spi: dts: sun4i: Add support for wait time between word transmissions Marcus Weseloh <mweseloh42@gmail.com> - 2015-12-26 17:00 +0100
  [PATCH v6 3/3] spi: sun4i: Add support for wait time between word transmissions Marcus Weseloh <mweseloh42@gmail.com> - 2015-12-26 17:00 +0100
    Re: [PATCH v6 3/3] spi: sun4i: Add support for wait time between  word transmissions Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-12-28 03:50 +0100

csiph-web