aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2016-01-09 12:45:10 +0000
committerSasha Levin <sasha.levin@oracle.com>2016-04-18 08:51:01 -0400
commit7fa28eeed844c4388957095e5c485eb6f87a14de (patch)
tree937dd1b0479fccbe2e05fe115e5c08f7401747dc /include
parent112958c534636b0cb8614adef3c7b758409fb27b (diff)
mmc: atmel-mci: restore dma on AVR32
[ Upstream commit 74843787158e9dff249f0528e7d4806102cc2c26 ] Commit ecb89f2f5f3e7 ("mmc: atmel-mci: remove compat for non DT board when requesting dma chan") broke dma on AVR32 and any other boards not using DT. This restores a fallback mechanism for such cases. Signed-off-by: Mans Rullgard <mans@mansr.com> Acked-by: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/atmel-mci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 9177947bf032..e753062b9355 100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -2,6 +2,7 @@
#define __LINUX_ATMEL_MCI_H
#include <linux/types.h>
+#include <linux/dmaengine.h>
#define ATMCI_MAX_NR_SLOTS 2
@@ -37,6 +38,7 @@ struct mci_slot_pdata {
*/
struct mci_platform_data {
struct mci_dma_data *dma_slave;
+ dma_filter_fn dma_filter;
struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS];
};