From 40bda3f5d23228a5a90a9cdf04f9f06c3de8149e Mon Sep 17 00:00:00 2001 From: Hein_Tibosch Date: Thu, 30 Aug 2012 16:34:27 +0000 Subject: [PATCH] --- yaml --- r: 332839 b: refs/heads/master c: 6bf2af8cd2cb35f6098953a33b9a160a4ca0b626 h: refs/heads/master i: 332837: ff1050358619b27cd96d91be9c574c12f26b8fd3 332835: 21d2528f521af2f882f3052f125e2e18660ce60a 332831: f473a052d5ab3939acc53e6bc85f0e69422b3935 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/atmel-mci-regs.h | 7 +++++++ trunk/drivers/mmc/host/atmel-mci.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9fa4e1c01ce0..95f97cc81017 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccdfe6122f61b40592820d48b4cde021295418a0 +refs/heads/master: 6bf2af8cd2cb35f6098953a33b9a160a4ca0b626 diff --git a/trunk/drivers/mmc/host/atmel-mci-regs.h b/trunk/drivers/mmc/host/atmel-mci-regs.h index ab56f7db5315..c97001e15227 100644 --- a/trunk/drivers/mmc/host/atmel-mci-regs.h +++ b/trunk/drivers/mmc/host/atmel-mci-regs.h @@ -140,6 +140,13 @@ #define atmci_writel(port,reg,value) \ __raw_writel((value), (port)->regs + reg) +/* On AVR chips the Peripheral DMA Controller is not connected to MCI. */ +#ifdef CONFIG_AVR32 +# define ATMCI_PDC_CONNECTED 0 +#else +# define ATMCI_PDC_CONNECTED 1 +#endif + /* * Fix sconfig's burst size according to atmel MCI. We need to convert them as: * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3. diff --git a/trunk/drivers/mmc/host/atmel-mci.c b/trunk/drivers/mmc/host/atmel-mci.c index 6823d963376e..312c8fd6e6d5 100644 --- a/trunk/drivers/mmc/host/atmel-mci.c +++ b/trunk/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;