summaryrefslogtreecommitdiffstats
path: root/include/linux/amba
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-03-21 10:13:05 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2014-05-12 12:52:45 +0200
commit4593df29b94b31de931dc20d7da2e6c468c8d473 (patch)
treee1574dd217822086ec3e92c1dc8d3a72289dc735 /include/linux/amba
parent363b8b46da76a4b082a526db0155771aefef2f33 (diff)
downloadlinux-stable-4593df29b94b31de931dc20d7da2e6c468c8d473.tar.gz
linux-stable-4593df29b94b31de931dc20d7da2e6c468c8d473.tar.bz2
linux-stable-4593df29b94b31de931dc20d7da2e6c468c8d473.zip
mmc: mmci: Enforce DT for signal direction and feedback clock
Remove the option to provide signal direction configuration and feeback clock as platform data, enforce it through DT. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'include/linux/amba')
-rw-r--r--include/linux/amba/mmci.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index 32a89cf5ec45..0d3ff95b3b4c 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -6,19 +6,6 @@
#include <linux/mmc/host.h>
-
-/*
- * These defines is places here due to access is needed from machine
- * configuration files. The ST Micro version does not have ROD and
- * reuse the voltage registers for direction settings.
- */
-#define MCI_ST_DATA2DIREN (1 << 2)
-#define MCI_ST_CMDDIREN (1 << 3)
-#define MCI_ST_DATA0DIREN (1 << 4)
-#define MCI_ST_DATA31DIREN (1 << 5)
-#define MCI_ST_FBCLKEN (1 << 7)
-#define MCI_ST_DATA74DIREN (1 << 8)
-
/* Just some dummy forwarding */
struct dma_chan;
@@ -45,8 +32,6 @@ struct dma_chan;
* @capabilities: the capabilities of the block as implemented in
* this platform, signify anything MMC_CAP_* from mmc/host.h
* @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h
- * @sigdir: a bit field indicating for what bits in the MMC bus the host
- * should enable signal direction indication.
* @dma_filter: function used to select an appropriate RX and TX
* DMA channel to be used for DMA, if and only if you're deploying the
* generic DMA engine
@@ -69,7 +54,6 @@ struct mmci_platform_data {
bool cd_invert;
unsigned long capabilities;
unsigned long capabilities2;
- u32 sigdir;
bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
void *dma_rx_param;
void *dma_tx_param;