diff options
author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 09:39:20 -0400 |
---|---|---|
committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 08:00:11 -0400 |
commit | a06a58abec1980b0fffbd07930aad6e7185d7a90 (patch) | |
tree | 5d23a44346f4bcf0355506265b47426dfbd3e5de /arch | |
parent | d9c295ad35ff9305d366ef6f72ee429d4c8fcf76 (diff) |
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')
-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 79907ec78d43..91145720822c 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/sysdev.h> | 20 | #include <linux/sysdev.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/dma-mapping.h> | ||
23 | 24 | ||
24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
25 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
@@ -119,6 +120,7 @@ static void s5pv210_sw_reset(void) | |||
119 | void __init s5pv210_map_io(void) | 120 | void __init s5pv210_map_io(void) |
120 | { | 121 | { |
121 | iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); | 122 | iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); |
123 | init_consistent_dma_size(14 << 20); | ||
122 | 124 | ||
123 | /* initialise device information early */ | 125 | /* initialise device information early */ |
124 | s5pv210_default_sdhci0(); | 126 | s5pv210_default_sdhci0(); |
diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h index 7b5fcf0da0c4..2d3cfa221d5f 100644 --- a/arch/arm/mach-s5pv210/include/mach/memory.h +++ b/arch/arm/mach-s5pv210/include/mach/memory.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #define __ASM_ARCH_MEMORY_H | 14 | #define __ASM_ARCH_MEMORY_H |
15 | 15 | ||
16 | #define PLAT_PHYS_OFFSET UL(0x20000000) | 16 | #define PLAT_PHYS_OFFSET UL(0x20000000) |
17 | #define CONSISTENT_DMA_SIZE (SZ_8M + SZ_4M + SZ_2M) | ||
18 | 17 | ||
19 | /* | 18 | /* |
20 | * Sparsemem support | 19 | * Sparsemem support |