diff options
| -rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
| -rw-r--r-- | include/asm-blackfin/bfin-global.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 785d8b4fa0cb..b87634e75f20 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -685,6 +685,8 @@ choice | |||
| 685 | prompt "Uncached SDRAM region" | 685 | prompt "Uncached SDRAM region" |
| 686 | default DMA_UNCACHED_1M | 686 | default DMA_UNCACHED_1M |
| 687 | depends on BFIN_DMA_5XX | 687 | depends on BFIN_DMA_5XX |
| 688 | config DMA_UNCACHED_4M | ||
| 689 | bool "Enable 4M DMA region" | ||
| 688 | config DMA_UNCACHED_2M | 690 | config DMA_UNCACHED_2M |
| 689 | bool "Enable 2M DMA region" | 691 | bool "Enable 2M DMA region" |
| 690 | config DMA_UNCACHED_1M | 692 | config DMA_UNCACHED_1M |
diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h index 716df7c85923..a9248d883675 100644 --- a/include/asm-blackfin/bfin-global.h +++ b/include/asm-blackfin/bfin-global.h | |||
| @@ -37,7 +37,9 @@ | |||
| 37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
| 38 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 39 | 39 | ||
| 40 | #if defined(CONFIG_DMA_UNCACHED_2M) | 40 | #if defined(CONFIG_DMA_UNCACHED_4M) |
| 41 | # define DMA_UNCACHED_REGION (4 * 1024 * 1024) | ||
| 42 | #elif defined(CONFIG_DMA_UNCACHED_2M) | ||
| 41 | # define DMA_UNCACHED_REGION (2 * 1024 * 1024) | 43 | # define DMA_UNCACHED_REGION (2 * 1024 * 1024) |
| 42 | #elif defined(CONFIG_DMA_UNCACHED_1M) | 44 | #elif defined(CONFIG_DMA_UNCACHED_1M) |
| 43 | # define DMA_UNCACHED_REGION (1024 * 1024) | 45 | # define DMA_UNCACHED_REGION (1024 * 1024) |
