diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-03-21 05:13:05 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-12 06:52:45 -0400 |
commit | 4593df29b94b31de931dc20d7da2e6c468c8d473 (patch) | |
tree | e1574dd217822086ec3e92c1dc8d3a72289dc735 /include/linux/amba | |
parent | 363b8b46da76a4b082a526db0155771aefef2f33 (diff) |
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.h | 16 |
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 @@ | |||
6 | 6 | ||
7 | #include <linux/mmc/host.h> | 7 | #include <linux/mmc/host.h> |
8 | 8 | ||
9 | |||
10 | /* | ||
11 | * These defines is places here due to access is needed from machine | ||
12 | * configuration files. The ST Micro version does not have ROD and | ||
13 | * reuse the voltage registers for direction settings. | ||
14 | */ | ||
15 | #define MCI_ST_DATA2DIREN (1 << 2) | ||
16 | #define MCI_ST_CMDDIREN (1 << 3) | ||
17 | #define MCI_ST_DATA0DIREN (1 << 4) | ||
18 | #define MCI_ST_DATA31DIREN (1 << 5) | ||
19 | #define MCI_ST_FBCLKEN (1 << 7) | ||
20 | #define MCI_ST_DATA74DIREN (1 << 8) | ||
21 | |||
22 | /* Just some dummy forwarding */ | 9 | /* Just some dummy forwarding */ |
23 | struct dma_chan; | 10 | struct dma_chan; |
24 | 11 | ||
@@ -45,8 +32,6 @@ struct dma_chan; | |||
45 | * @capabilities: the capabilities of the block as implemented in | 32 | * @capabilities: the capabilities of the block as implemented in |
46 | * this platform, signify anything MMC_CAP_* from mmc/host.h | 33 | * this platform, signify anything MMC_CAP_* from mmc/host.h |
47 | * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h | 34 | * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h |
48 | * @sigdir: a bit field indicating for what bits in the MMC bus the host | ||
49 | * should enable signal direction indication. | ||
50 | * @dma_filter: function used to select an appropriate RX and TX | 35 | * @dma_filter: function used to select an appropriate RX and TX |
51 | * DMA channel to be used for DMA, if and only if you're deploying the | 36 | * DMA channel to be used for DMA, if and only if you're deploying the |
52 | * generic DMA engine | 37 | * generic DMA engine |
@@ -69,7 +54,6 @@ struct mmci_platform_data { | |||
69 | bool cd_invert; | 54 | bool cd_invert; |
70 | unsigned long capabilities; | 55 | unsigned long capabilities; |
71 | unsigned long capabilities2; | 56 | unsigned long capabilities2; |
72 | u32 sigdir; | ||
73 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); | 57 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); |
74 | void *dma_rx_param; | 58 | void *dma_rx_param; |
75 | void *dma_tx_param; | 59 | void *dma_tx_param; |