From: David Lechner <dlechner@baylibre.com>
To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org
Cc: "David Lechner" <dlechner@baylibre.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Michael Hennerich" <Michael.Hennerich@analog.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Lars-Peter Clausen" <lars@metafoo.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 13/14] spi: axi-spi-engine: add support for cs_off
Date: Fri, 17 Nov 2023 14:13:04 -0600 [thread overview]
Message-ID: <20231117-axi-spi-engine-series-1-v1-13-cc59db999b87@baylibre.com> (raw)
In-Reply-To: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com>
This adds support for the spi_transfer::cs_off flag to the AXI SPI
Engine driver.
The logic is copied from the generic spi_transfer_one_message() in
spi.c.
Signed-off-by: David Lechner <dlechner@baylibre.com>
---
drivers/spi/spi-axi-spi-engine.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
index c39f478f34a7..1c60e6486ee2 100644
--- a/drivers/spi/spi-axi-spi-engine.c
+++ b/drivers/spi/spi-axi-spi-engine.c
@@ -216,7 +216,7 @@ static int spi_engine_compile_message(struct spi_engine *spi_engine,
struct spi_device *spi = msg->spi;
struct spi_transfer *xfer;
int clk_div, new_clk_div;
- bool cs_change = true;
+ bool keep_cs = false;
clk_div = -1;
@@ -224,6 +224,9 @@ static int spi_engine_compile_message(struct spi_engine *spi_engine,
SPI_ENGINE_CMD_WRITE(SPI_ENGINE_CMD_REG_CONFIG,
spi_engine_get_config(spi)));
+ xfer = list_first_entry(&msg->transfers, struct spi_transfer, transfer_list);
+ spi_engine_gen_cs(p, dry, spi, !xfer->cs_off);
+
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
new_clk_div = spi_engine_get_clk_div(spi_engine, spi, xfer);
if (new_clk_div != clk_div) {
@@ -233,20 +236,28 @@ static int spi_engine_compile_message(struct spi_engine *spi_engine,
clk_div));
}
- if (cs_change)
- spi_engine_gen_cs(p, dry, spi, true);
-
spi_engine_gen_xfer(p, dry, xfer);
spi_engine_gen_sleep(p, dry, spi_engine, clk_div, xfer);
- cs_change = xfer->cs_change;
- if (list_is_last(&xfer->transfer_list, &msg->transfers))
- cs_change = !cs_change;
-
- if (cs_change)
- spi_engine_gen_cs(p, dry, spi, false);
+ if (xfer->cs_change) {
+ if (list_is_last(&xfer->transfer_list, &msg->transfers)) {
+ keep_cs = true;
+ } else {
+ if (!xfer->cs_off)
+ spi_engine_gen_cs(p, dry, spi, false);
+
+ if (!list_next_entry(xfer, transfer_list)->cs_off)
+ spi_engine_gen_cs(p, dry, spi, true);
+ }
+ } else if (!list_is_last(&xfer->transfer_list, &msg->transfers) &&
+ xfer->cs_off != list_next_entry(xfer, transfer_list)->cs_off) {
+ spi_engine_gen_cs(p, dry, spi, xfer->cs_off);
+ }
}
+ if (!keep_cs)
+ spi_engine_gen_cs(p, dry, spi, false);
+
return 0;
}
--
2.42.0
next prev parent reply other threads:[~2023-11-17 20:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-17 20:12 [PATCH 00/14] spi: axi-spi-engine improvements David Lechner
2023-11-17 20:12 ` [PATCH 01/14] dt-bindings: spi: axi-spi-engine: convert to yaml David Lechner
2023-11-19 16:18 ` Rob Herring
2023-11-17 20:12 ` [PATCH 02/14] MAINTAINERS: add entry for AXI SPI Engine David Lechner
2023-11-17 20:44 ` David Lechner
2023-11-19 19:01 ` Lars-Peter Clausen
2023-11-17 20:12 ` [PATCH 03/14] spi: axi-spi-engine: simplify driver data allocation David Lechner
2023-11-17 20:12 ` [PATCH 04/14] spi: axi-spi-engine: use devm_spi_alloc_host() David Lechner
2023-11-17 20:12 ` [PATCH 05/14] spi: axi-spi-engine: use devm action to reset hw on remove David Lechner
2023-11-17 20:12 ` [PATCH 06/14] spi: axi-spi-engine: use devm_request_irq() David Lechner
2023-11-17 20:12 ` [PATCH 07/14] spi: axi-spi-engine: use devm_spi_register_controller() David Lechner
2023-11-17 20:12 ` [PATCH 08/14] spi: axi-spi-engine: check for valid clock rate David Lechner
2023-11-17 20:13 ` [PATCH 09/14] spi: axi-spi-engine: move msg state to new struct David Lechner
2023-11-18 3:55 ` kernel test robot
2023-11-17 20:13 ` [PATCH 10/14] spi: axi-spi-engine: use message_prepare/unprepare David Lechner
2023-11-17 20:13 ` [PATCH 11/14] spi: axi-spi-engine: remove completed_id from driver state David Lechner
2023-11-17 20:13 ` [PATCH 12/14] spi: axi-spi-engine: remove struct spi_engine::msg David Lechner
2023-11-17 20:13 ` David Lechner [this message]
2023-11-17 20:13 ` [PATCH 14/14] spi: axi-spi-engine: add support for any word size David Lechner
2023-11-20 18:25 ` [PATCH 00/14] spi: axi-spi-engine improvements Mark Brown
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=20231117-axi-spi-engine-series-1-v1-13-cc59db999b87@baylibre.com \
--to=dlechner@baylibre.com \
--cc=Michael.Hennerich@analog.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=nuno.sa@analog.com \
--cc=robh+dt@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.