diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-20 00:45:54 -0400 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-06-02 05:20:25 -0400 |
| commit | 8c3a05b489ef097f86bf87c64192456553f57781 (patch) | |
| tree | 1b2747413f4b49a0b61568be3232c7b176765c17 /include/linux/amba | |
| parent | 5080a08d0f8a4b2ba3a15e5ddc5ece84a444cad8 (diff) | |
mmc: mmci: Enforce DMA configuration through DT
Remove the option to provide DMA configuration as platform data,
enforce it through DT.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Roland Stigge <stigge@antcom.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/mmci.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 3f95d32d5277..8c98113069ce 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h | |||
| @@ -6,9 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/mmc/host.h> | 7 | #include <linux/mmc/host.h> |
| 8 | 8 | ||
| 9 | /* Just some dummy forwarding */ | ||
| 10 | struct dma_chan; | ||
| 11 | |||
| 12 | /** | 9 | /** |
| 13 | * struct mmci_platform_data - platform configuration for the MMCI | 10 | * struct mmci_platform_data - platform configuration for the MMCI |
| 14 | * (also known as PL180) block. | 11 | * (also known as PL180) block. |
| @@ -26,17 +23,6 @@ struct dma_chan; | |||
| 26 | * @gpio_wp: read this GPIO pin to see if the card is write protected | 23 | * @gpio_wp: read this GPIO pin to see if the card is write protected |
| 27 | * @gpio_cd: read this GPIO pin to detect card insertion | 24 | * @gpio_cd: read this GPIO pin to detect card insertion |
| 28 | * @cd_invert: true if the gpio_cd pin value is active low | 25 | * @cd_invert: true if the gpio_cd pin value is active low |
| 29 | * @dma_filter: function used to select an appropriate RX and TX | ||
| 30 | * DMA channel to be used for DMA, if and only if you're deploying the | ||
| 31 | * generic DMA engine | ||
| 32 | * @dma_rx_param: parameter passed to the DMA allocation | ||
| 33 | * filter in order to select an appropriate RX channel. If | ||
| 34 | * there is a bidirectional RX+TX channel, then just specify | ||
| 35 | * this and leave dma_tx_param set to NULL | ||
| 36 | * @dma_tx_param: parameter passed to the DMA allocation | ||
| 37 | * filter in order to select an appropriate TX channel. If this | ||
| 38 | * is NULL the driver will attempt to use the RX channel as a | ||
| 39 | * bidirectional channel | ||
| 40 | */ | 26 | */ |
| 41 | struct mmci_platform_data { | 27 | struct mmci_platform_data { |
| 42 | unsigned int ocr_mask; | 28 | unsigned int ocr_mask; |
| @@ -45,9 +31,6 @@ struct mmci_platform_data { | |||
| 45 | int gpio_wp; | 31 | int gpio_wp; |
| 46 | int gpio_cd; | 32 | int gpio_cd; |
| 47 | bool cd_invert; | 33 | bool cd_invert; |
| 48 | bool (*dma_filter)(struct dma_chan *chan, void *filter_param); | ||
| 49 | void *dma_rx_param; | ||
| 50 | void *dma_tx_param; | ||
| 51 | }; | 34 | }; |
| 52 | 35 | ||
| 53 | #endif | 36 | #endif |
