From c22524a367fc6b62c519bc1eff6a35b874255b25 Mon Sep 17 00:00:00 2001 From: Cliff Cai Date: Sat, 17 May 2008 16:36:52 +0800 Subject: [PATCH] --- yaml --- r: 96975 b: refs/heads/master c: 86ad79321cbacdc4deebcde81849d19e26dd18e2 h: refs/heads/master i: 96973: 963f29eaf3f6f0521efdf8bbdfb6d8357734dce7 96971: 1ac6fe97e548f077f2d4c1d9bccc1808435c093d 96967: 9203b166e6b72bbe882f4645ccbc33cb2578233e 96959: 33dbf1a7e4bf9dc73df620c711025e70d0ab2ee3 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/Kconfig | 2 ++ trunk/include/asm-blackfin/bfin-global.h | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1910730c7704..ccdb57703d7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6c6f75d54ca734c409e336245662934c21fcee0 +refs/heads/master: 86ad79321cbacdc4deebcde81849d19e26dd18e2 diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index 785d8b4fa0cb..b87634e75f20 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -685,6 +685,8 @@ choice prompt "Uncached SDRAM region" default DMA_UNCACHED_1M depends on BFIN_DMA_5XX +config DMA_UNCACHED_4M + bool "Enable 4M DMA region" config DMA_UNCACHED_2M bool "Enable 2M DMA region" config DMA_UNCACHED_1M diff --git a/trunk/include/asm-blackfin/bfin-global.h b/trunk/include/asm-blackfin/bfin-global.h index 716df7c85923..a9248d883675 100644 --- a/trunk/include/asm-blackfin/bfin-global.h +++ b/trunk/include/asm-blackfin/bfin-global.h @@ -37,7 +37,9 @@ #include #include -#if defined(CONFIG_DMA_UNCACHED_2M) +#if defined(CONFIG_DMA_UNCACHED_4M) +# define DMA_UNCACHED_REGION (4 * 1024 * 1024) +#elif defined(CONFIG_DMA_UNCACHED_2M) # define DMA_UNCACHED_REGION (2 * 1024 * 1024) #elif defined(CONFIG_DMA_UNCACHED_1M) # define DMA_UNCACHED_REGION (1024 * 1024)