From e7a397ad458afa96ac7a132b6541a234ebfcbe44 Mon Sep 17 00:00:00 2001 From: Scott Jiang Date: Fri, 18 May 2012 16:27:22 -0400 Subject: [PATCH] --- yaml --- r: 313802 b: refs/heads/master c: c8d11a06bf8242d5d6ff86fa2514c4f50cb847fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/Kconfig | 6 ++++++ trunk/arch/blackfin/include/asm/bfin-global.h | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 40acc8610882..6a2249e3b19a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cdd7008334854a1e9a0b7ceefdccbd3fdfe372a +refs/heads/master: c8d11a06bf8242d5d6ff86fa2514c4f50cb847fb diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index fef96f47876c..2baa4938d741 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -1009,6 +1009,12 @@ config HAVE_PWM choice prompt "Uncached DMA region" default DMA_UNCACHED_1M +config DMA_UNCACHED_32M + bool "Enable 32M DMA region" +config DMA_UNCACHED_16M + bool "Enable 16M DMA region" +config DMA_UNCACHED_8M + bool "Enable 8M DMA region" config DMA_UNCACHED_4M bool "Enable 4M DMA region" config DMA_UNCACHED_2M diff --git a/trunk/arch/blackfin/include/asm/bfin-global.h b/trunk/arch/blackfin/include/asm/bfin-global.h index 608be5e6d25c..dc47d79287f9 100644 --- a/trunk/arch/blackfin/include/asm/bfin-global.h +++ b/trunk/arch/blackfin/include/asm/bfin-global.h @@ -14,7 +14,13 @@ #include #include -#if defined(CONFIG_DMA_UNCACHED_4M) +#if defined(CONFIG_DMA_UNCACHED_32M) +# define DMA_UNCACHED_REGION (32 * 1024 * 1024) +#elif defined(CONFIG_DMA_UNCACHED_16M) +# define DMA_UNCACHED_REGION (16 * 1024 * 1024) +#elif defined(CONFIG_DMA_UNCACHED_8M) +# define DMA_UNCACHED_REGION (8 * 1024 * 1024) +#elif 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)