From 55924bb9947068d54fffc4d826a352aca773e0d3 Mon Sep 17 00:00:00 2001 From: Manuel Lauss Date: Tue, 29 Jul 2008 10:10:49 +0200 Subject: [PATCH] --- yaml --- r: 107255 b: refs/heads/master c: e491d230fd398bb730e3c2dd734c5447463b9d38 h: refs/heads/master i: 107253: 043c46ae22ac00b9e20fc0436d7fbef71ac55a4a 107251: d664a5d386c29f0b2f05bc67220eb3d81f4b6e68 107247: fd55904011629870045498c1a485a041fac76826 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/au1xmmc.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0a85b7329f5..c68336087eda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b41e9c7b8e14ea57aa0fc05fd63a0de0e935d58d +refs/heads/master: e491d230fd398bb730e3c2dd734c5447463b9d38 diff --git a/trunk/drivers/mmc/host/au1xmmc.c b/trunk/drivers/mmc/host/au1xmmc.c index 99b20917cc0f..d3f55615c099 100644 --- a/trunk/drivers/mmc/host/au1xmmc.c +++ b/trunk/drivers/mmc/host/au1xmmc.c @@ -61,7 +61,13 @@ /* Hardware definitions */ #define AU1XMMC_DESCRIPTOR_COUNT 1 -#define AU1XMMC_DESCRIPTOR_SIZE 2048 + +/* max DMA seg size: 64KB on Au1100, 4MB on Au1200 */ +#ifdef CONFIG_SOC_AU1100 +#define AU1XMMC_DESCRIPTOR_SIZE 0x0000ffff +#else /* Au1200 */ +#define AU1XMMC_DESCRIPTOR_SIZE 0x003fffff +#endif #define AU1XMMC_OCR (MMC_VDD_27_28 | MMC_VDD_28_29 | MMC_VDD_29_30 | \ MMC_VDD_30_31 | MMC_VDD_31_32 | MMC_VDD_32_33 | \