diff options
| author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 14:39:20 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 12:00:11 +0000 |
| commit | a06a58abec1980b0fffbd07930aad6e7185d7a90 (patch) | |
| tree | 5d23a44346f4bcf0355506265b47426dfbd3e5de /arch/arm | |
| parent | d9c295ad35ff9305d366ef6f72ee429d4c8fcf76 (diff) | |
| download | op-kernel-dev-a06a58abec1980b0fffbd07930aad6e7185d7a90.zip op-kernel-dev-a06a58abec1980b0fffbd07930aad6e7185d7a90.tar.gz | |
ARM: mach-s5pv210: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/memory.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 79907ec..9114572 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c @@ -20,6 +20,7 @@ #include <linux/sysdev.h> #include <linux/platform_device.h> #include <linux/sched.h> +#include <linux/dma-mapping.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -119,6 +120,7 @@ static void s5pv210_sw_reset(void) void __init s5pv210_map_io(void) { iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); + init_consistent_dma_size(14 << 20); /* initialise device information early */ s5pv210_default_sdhci0(); diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h index 7b5fcf0..2d3cfa2 100644 --- a/arch/arm/mach-s5pv210/include/mach/memory.h +++ b/arch/arm/mach-s5pv210/include/mach/memory.h @@ -14,7 +14,6 @@ #define __ASM_ARCH_MEMORY_H #define PLAT_PHYS_OFFSET UL(0x20000000) -#define CONSISTENT_DMA_SIZE (SZ_8M + SZ_4M + SZ_2M) /* * Sparsemem support |
