summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2015-04-13 05:12:06 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2015-04-14 20:47:49 +0200
commit16df43459255745465f296610be1000ab9165fa2 (patch)
treeb499740b105b94b0f4122108f2e2ef9912e5a43d /drivers/spi
parent11491a18a1f579df4de8321a540b0c8420169714 (diff)
downloadbarebox-16df43459255745465f296610be1000ab9165fa2.tar.gz
barebox-16df43459255745465f296610be1000ab9165fa2.tar.xz
spi: i.MX: Respect the value of 'cs_change'
Add the code to correctly handle 'cs_change' field in 'struct spi_transfer'(base on the similar code from altera_spi.c) Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/imx_spi.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index a1f19eba8b..e552d5fe01 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -29,6 +29,7 @@
#include <mach/generic.h>
#include <linux/clk.h>
#include <linux/err.h>
+#include <clock.h>
#define CSPI_0_0_RXDATA 0x00
#define CSPI_0_0_TXDATA 0x04
@@ -457,17 +458,34 @@ static int imx_spi_transfer(struct spi_device *spi, struct spi_message *mesg)
{
struct imx_spi *imx = container_of(spi->master, struct imx_spi, master);
struct spi_transfer *t;
+ unsigned int cs_change;
+ const int nsecs = 50;
imx->chipselect(spi, 1);
+ cs_change = 0;
+
mesg->actual_length = 0;
list_for_each_entry(t, &mesg->transfers, transfer_list) {
+ if (cs_change) {
+ ndelay(nsecs);
+ imx->chipselect(spi, 0);
+ ndelay(nsecs);
+ imx->chipselect(spi, 1);
+ }
+
+ cs_change = t->cs_change;
+
imx_spi_do_transfer(spi, t);
mesg->actual_length += t->len;
+
+ if (cs_change)
+ imx->chipselect(spi, 1);
}
- imx->chipselect(spi, 0);
+ if (!cs_change)
+ imx->chipselect(spi, 0);
return 0;
}