summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2013-02-23 02:43:00 +0000
committerStefano Babic <sbabic@denx.de>2013-03-07 17:22:56 +0100
commitd3f26a27003d55ce17ca54e84799fa18b965c3dc (patch)
treef82bce64ac12e0dfa4d7388d9b6280863962f1c0
parentc96e78ccfe81394d87cbff855f40f5d7cd377811 (diff)
downloadblackbird-obmc-uboot-d3f26a27003d55ce17ca54e84799fa18b965c3dc.tar.gz
blackbird-obmc-uboot-d3f26a27003d55ce17ca54e84799fa18b965c3dc.zip
mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE
The CONFIG_MXS_SPI_DMA_ENABLE is no longer relevant as the SPI DMA has proven to work correctly. Remove this configuration option. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Stefano Babic <sbabic@denx.de>
-rw-r--r--drivers/spi/mxs_spi.c16
-rw-r--r--include/configs/m28evk.h1
-rw-r--r--include/configs/mx28evk.h1
3 files changed, 0 insertions, 18 deletions
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index b5b32dc5cc..ffa3c1d693 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -40,17 +40,6 @@
#define MXSSSP_SMALL_TRANSFER 512
-/*
- * CONFIG_MXS_SPI_DMA_ENABLE: Experimental mixed PIO/DMA support for MXS SPI
- * host. Use with utmost caution!
- *
- * Enabling this is not yet recommended since this
- * still doesn't support transfers to/from unaligned
- * addresses. Therefore this driver will not work
- * for example with saving environment. This is
- * caused by DMA alignment constraints on MXS.
- */
-
struct mxs_spi_slave {
struct spi_slave slave;
uint32_t max_khz;
@@ -347,12 +336,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
char dummy;
int write = 0;
char *data = NULL;
-
-#ifdef CONFIG_MXS_SPI_DMA_ENABLE
int dma = 1;
-#else
- int dma = 0;
-#endif
if (bitlen == 0) {
if (flags & SPI_XFER_END) {
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 1b51fe2dc5..59a7be931d 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -244,7 +244,6 @@
#ifdef CONFIG_CMD_SPI
#define CONFIG_HARD_SPI
#define CONFIG_MXS_SPI
-#define CONFIG_MXS_SPI_DMA_ENABLE
#define CONFIG_SPI_HALF_DUPLEX
#define CONFIG_DEFAULT_SPI_BUS 2
#define CONFIG_DEFAULT_SPI_CS 0
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 71447d910e..6a46f3c08a 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -202,7 +202,6 @@
#ifdef CONFIG_CMD_SPI
#define CONFIG_HARD_SPI
#define CONFIG_MXS_SPI
-#define CONFIG_MXS_SPI_DMA_ENABLE
#define CONFIG_SPI_HALF_DUPLEX
#define CONFIG_DEFAULT_SPI_BUS 2
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
OpenPOWER on IntegriCloud