summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/atmel-mci.c
diff options
context:
space:
mode:
authorHein_Tibosch <hein_tibosch@yahoo.es>2012-08-30 16:34:27 +0000
committerChris Ball <cjb@laptop.org>2012-10-03 10:05:23 -0400
commit6bf2af8cd2cb35f6098953a33b9a160a4ca0b626 (patch)
treee1a4b117355ce6b8148c2778085843af6b903cd6 /drivers/mmc/host/atmel-mci.c
parentccdfe6122f61b40592820d48b4cde021295418a0 (diff)
downloadblackbird-op-linux-6bf2af8cd2cb35f6098953a33b9a160a4ca0b626.tar.gz
blackbird-op-linux-6bf2af8cd2cb35f6098953a33b9a160a4ca0b626.zip
mmc: atmel-mci: AP700x PDC is not connected to MCI
Earlier, atmel-mci was adapted to make use of the peripheral DMA controller (PDC), in case normal DMA wouldn't work. ( http://comments.gmane.org/gmane.linux.kernel.mmc/9403 ) This works OK on ARM platforms (AT91), but it broke the driver for AVR32, the AP700x. Although the MCI has PDC support, the connection is not done for AVR chips. This patch makes the use of PDC depend on !CONFIG_AVR32. Signed-off-by: Hein Tibosch <hein_tibosch@yahoo.es> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/atmel-mci.c')
-rw-r--r--drivers/mmc/host/atmel-mci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 6823d963376e..312c8fd6e6d5 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2290,7 +2290,7 @@ static void __init atmci_get_cap(struct atmel_mci *host)
"version: 0x%x\n", version);
host->caps.has_dma_conf_reg = 0;
- host->caps.has_pdc = 1;
+ host->caps.has_pdc = ATMCI_PDC_CONNECTED;
host->caps.has_cfg_reg = 0;
host->caps.has_cstor_reg = 0;
host->caps.has_highspeed = 0;
OpenPOWER on IntegriCloud