diff options
| author | Mans Rullgard <mans@mansr.com> | 2016-01-09 12:45:10 +0000 |
|---|---|---|
| committer | Hans-Christian Egtvedt <egtvedt@samfundet.no> | 2016-01-14 13:40:13 +0100 |
| commit | 74843787158e9dff249f0528e7d4806102cc2c26 (patch) | |
| tree | c5a8b3c384392ac82867c4883c6e8df37152190e /arch | |
| parent | a193f07d1e3cda30513914b1e88967419a9dbd8c (diff) | |
| download | linux-74843787158e9dff249f0528e7d4806102cc2c26.tar.bz2 | |
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 'arch')
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index b4cb3bd89d8a..6e906172dc33 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c @@ -1321,6 +1321,21 @@ static struct clk atmel_mci0_pclk = { .index = 9, }; +static bool at32_mci_dma_filter(struct dma_chan *chan, void *pdata) +{ + struct mci_dma_data *sl = pdata; + + if (!sl) + return false; + + if (find_slave_dev(sl) == chan->device->dev) { + chan->private = slave_data_ptr(sl); + return true; + } + + return false; +} + struct platform_device *__init at32_add_device_mci(unsigned int id, struct mci_platform_data *data) { @@ -1355,6 +1370,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) slave->sdata.dst_master = 0; data->dma_slave = slave; + data->dma_filter = at32_mci_dma_filter; if (platform_device_add_data(pdev, data, sizeof(struct mci_platform_data))) |