summaryrefslogtreecommitdiffstats
path: root/include/linux/amba
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-05-20 06:45:54 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2014-06-02 11:20:25 +0200
commit8c3a05b489ef097f86bf87c64192456553f57781 (patch)
tree1b2747413f4b49a0b61568be3232c7b176765c17 /include/linux/amba
parent5080a08d0f8a4b2ba3a15e5ddc5ece84a444cad8 (diff)
downloadop-kernel-dev-8c3a05b489ef097f86bf87c64192456553f57781.zip
op-kernel-dev-8c3a05b489ef097f86bf87c64192456553f57781.tar.gz
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.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index 3f95d32..8c98113 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -6,9 +6,6 @@
#include <linux/mmc/host.h>
-/* Just some dummy forwarding */
-struct dma_chan;
-
/**
* struct mmci_platform_data - platform configuration for the MMCI
* (also known as PL180) block.
@@ -26,17 +23,6 @@ struct dma_chan;
* @gpio_wp: read this GPIO pin to see if the card is write protected
* @gpio_cd: read this GPIO pin to detect card insertion
* @cd_invert: true if the gpio_cd pin value is active low
- * @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
- * @dma_rx_param: parameter passed to the DMA allocation
- * filter in order to select an appropriate RX channel. If
- * there is a bidirectional RX+TX channel, then just specify
- * this and leave dma_tx_param set to NULL
- * @dma_tx_param: parameter passed to the DMA allocation
- * filter in order to select an appropriate TX channel. If this
- * is NULL the driver will attempt to use the RX channel as a
- * bidirectional channel
*/
struct mmci_platform_data {
unsigned int ocr_mask;
@@ -45,9 +31,6 @@ struct mmci_platform_data {
int gpio_wp;
int gpio_cd;
bool cd_invert;
- bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
- void *dma_rx_param;
- void *dma_tx_param;
};
#endif
OpenPOWER on IntegriCloud