diff options
| author | Mans Rullgard <mans@mansr.com> | 2016-01-09 07:45:10 -0500 |
|---|---|---|
| committer | Hans-Christian Egtvedt <egtvedt@samfundet.no> | 2016-01-14 07:40:13 -0500 |
| commit | 74843787158e9dff249f0528e7d4806102cc2c26 (patch) | |
| tree | c5a8b3c384392ac82867c4883c6e8df37152190e /include/linux | |
| parent | a193f07d1e3cda30513914b1e88967419a9dbd8c (diff) | |
mmc: atmel-mci: restore dma on AVR32
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atmel-mci.h | 2 |
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 @@ | |||
| 2 | #define __LINUX_ATMEL_MCI_H | 2 | #define __LINUX_ATMEL_MCI_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/dmaengine.h> | ||
| 5 | 6 | ||
| 6 | #define ATMCI_MAX_NR_SLOTS 2 | 7 | #define ATMCI_MAX_NR_SLOTS 2 |
| 7 | 8 | ||
| @@ -37,6 +38,7 @@ struct mci_slot_pdata { | |||
| 37 | */ | 38 | */ |
| 38 | struct mci_platform_data { | 39 | struct mci_platform_data { |
| 39 | struct mci_dma_data *dma_slave; | 40 | struct mci_dma_data *dma_slave; |
| 41 | dma_filter_fn dma_filter; | ||
| 40 | struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS]; | 42 | struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS]; |
| 41 | }; | 43 | }; |
| 42 | 44 | ||
