diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-03-21 05:29:10 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-12 06:52:45 -0400 |
commit | 3faf80dfa342e98b5780e0b78b7a670c7b61a9be (patch) | |
tree | 290a72b267802b0dd612f1d98ab77853d1669a15 /include/linux/amba | |
parent | 4593df29b94b31de931dc20d7da2e6c468c8d473 (diff) |
mmc: mmci: Enforce mmc capabilities through DT
Remove the option to provide the flags for mmc capabilities 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 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 0d3ff95b3b4c..b992fc931295 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h | |||
@@ -29,9 +29,6 @@ struct dma_chan; | |||
29 | * @gpio_wp: read this GPIO pin to see if the card is write protected | 29 | * @gpio_wp: read this GPIO pin to see if the card is write protected |
30 | * @gpio_cd: read this GPIO pin to detect card insertion | 30 | * @gpio_cd: read this GPIO pin to detect card insertion |
31 | * @cd_invert: true if the gpio_cd pin value is active low | 31 | * @cd_invert: true if the gpio_cd pin value is active low |
32 | * @capabilities: the capabilities of the block as implemented in | ||
33 | * this platform, signify anything MMC_CAP_* from mmc/host.h | ||
34 | * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h | ||
35 | * @dma_filter: function used to select an appropriate RX and TX | 32 | * @dma_filter: function used to select an appropriate RX and TX |
36 | * DMA channel to be used for DMA, if and only if you're deploying the | 33 | * DMA channel to be used for DMA, if and only if you're deploying the |
37 | * generic DMA engine | 34 | * generic DMA engine |
@@ -52,8 +49,6 @@ struct mmci_platform_data { | |||
52 | int gpio_wp; | 49 | int gpio_wp; |
53 | int gpio_cd; | 50 | int gpio_cd; |
54 | bool cd_invert; | 51 | bool cd_invert; |
55 | unsigned long capabilities; | ||
56 | unsigned long capabilities2; | ||
57 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); | 52 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); |
58 | void *dma_rx_param; | 53 | void *dma_rx_param; |
59 | void *dma_tx_param; | 54 | void *dma_tx_param; |