Commit fed8d8c7 authored by Mans Rullgard's avatar Mans Rullgard Committed by Mark Brown

spi: atmel: fix handling of cs_change set on non-last xfer

The driver does the wrong thing when cs_change is set on a non-last
xfer in a message.  When cs_change is set, the driver deactivates the
CS and leaves it off until a later xfer again has cs_change set whereas
it should be briefly toggling CS off and on again.

This patch brings the behaviour of the driver back in line with the
documentation and common sense.  The delay of 10 us is the same as is
used by the default spi_transfer_one_message() function in spi.c.
[gregory: rebased on for-5.5 from spi tree]
Fixes: 8090d6d1 ("spi: atmel: Refactor spi-atmel to use SPI framework queue")
Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Link: https://lore.kernel.org/r/20191018153504.4249-1-gregory.clement@bootlin.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2de860b4
...@@ -302,7 +302,6 @@ struct atmel_spi { ...@@ -302,7 +302,6 @@ struct atmel_spi {
bool use_cs_gpios; bool use_cs_gpios;
bool keep_cs; bool keep_cs;
bool cs_active;
u32 fifo_size; u32 fifo_size;
}; };
...@@ -1376,11 +1375,9 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1376,11 +1375,9 @@ static int atmel_spi_one_transfer(struct spi_master *master,
&msg->transfers)) { &msg->transfers)) {
as->keep_cs = true; as->keep_cs = true;
} else { } else {
as->cs_active = !as->cs_active; cs_deactivate(as, msg->spi);
if (as->cs_active) udelay(10);
cs_activate(as, msg->spi); cs_activate(as, msg->spi);
else
cs_deactivate(as, msg->spi);
} }
} }
...@@ -1403,7 +1400,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master, ...@@ -1403,7 +1400,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master,
atmel_spi_lock(as); atmel_spi_lock(as);
cs_activate(as, spi); cs_activate(as, spi);
as->cs_active = true;
as->keep_cs = false; as->keep_cs = false;
msg->status = 0; msg->status = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment