summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-04-20 22:11:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-04-27 08:09:34 +0200
commite1eb43624268f2a2b87423dbe721c735d3e16280 (patch)
tree4cfe405c48398ff6c463a067232a05701125f575 /drivers/spi
parent43ba8232ab75133227cef3a7c4b7ae22703c53c1 (diff)
downloadbarebox-e1eb43624268f2a2b87423dbe721c735d3e16280.tar.gz
barebox-e1eb43624268f2a2b87423dbe721c735d3e16280.tar.xz
spi: ath79: move spidelay from spi-bitbang-txrx
Bitbang helpers for SPI require spidelay. This should be set by the user and not the helper itself. Move it to ath79_spi instead. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/ath79_spi.c2
-rw-r--r--drivers/spi/spi-bitbang-txrx.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
index d9ab269da7..4d71eba695 100644
--- a/drivers/spi/ath79_spi.c
+++ b/drivers/spi/ath79_spi.c
@@ -100,6 +100,8 @@ static inline u32 getmiso(struct spi_device *spi)
return !!((ath79_spi_rr(sc, AR71XX_SPI_REG_RDS) & 1));
}
+#define spidelay(nsecs) udelay(nsecs/1000)
+
#include "spi-bitbang-txrx.h"
static inline void ath79_spi_chipselect(struct ath79_spi *sp, int chipselect)
diff --git a/drivers/spi/spi-bitbang-txrx.h b/drivers/spi/spi-bitbang-txrx.h
index 4c74d4e0c5..078ab8c6c0 100644
--- a/drivers/spi/spi-bitbang-txrx.h
+++ b/drivers/spi/spi-bitbang-txrx.h
@@ -42,8 +42,6 @@
* particular CPU clock rate.
*/
-#define spidelay(nsecs) udelay(nsecs/1000)
-
static inline u32
bitbang_txrx_be_cpha0(struct spi_device *spi,
unsigned nsecs, unsigned cpol,