diff options
author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 05:46:46 -0400 |
---|---|---|
committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 08:00:10 -0400 |
commit | d9c295ad35ff9305d366ef6f72ee429d4c8fcf76 (patch) | |
tree | e3332b21fe9c610bf39db6db9b016bd1c257b98e | |
parent | 284dc060084d93f56c2b80b79eac61c653dccd85 (diff) |
ARM: mach-s5p64x0: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-s5p64x0/cpu.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/memory.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c index a5c00952ea35..8a938542c54d 100644 --- a/arch/arm/mach-s5p64x0/cpu.c +++ b/arch/arm/mach-s5p64x0/cpu.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.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> |
@@ -111,6 +112,7 @@ void __init s5p6440_map_io(void) | |||
111 | 112 | ||
112 | iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); | 113 | iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); |
113 | iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc)); | 114 | iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc)); |
115 | init_consistent_dma_size(SZ_8M); | ||
114 | } | 116 | } |
115 | 117 | ||
116 | void __init s5p6450_map_io(void) | 118 | void __init s5p6450_map_io(void) |
@@ -120,6 +122,7 @@ void __init s5p6450_map_io(void) | |||
120 | 122 | ||
121 | iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); | 123 | iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); |
122 | iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc)); | 124 | iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc)); |
125 | init_consistent_dma_size(SZ_8M); | ||
123 | } | 126 | } |
124 | 127 | ||
125 | /* | 128 | /* |
diff --git a/arch/arm/mach-s5p64x0/include/mach/memory.h b/arch/arm/mach-s5p64x0/include/mach/memory.h index 365a6eb4b88f..b14cbc3f521b 100644 --- a/arch/arm/mach-s5p64x0/include/mach/memory.h +++ b/arch/arm/mach-s5p64x0/include/mach/memory.h | |||
@@ -14,6 +14,5 @@ | |||
14 | #define __ASM_ARCH_MEMORY_H __FILE__ | 14 | #define __ASM_ARCH_MEMORY_H __FILE__ |
15 | 15 | ||
16 | #define PLAT_PHYS_OFFSET UL(0x20000000) | 16 | #define PLAT_PHYS_OFFSET UL(0x20000000) |
17 | #define CONSISTENT_DMA_SIZE SZ_8M | ||
18 | 17 | ||
19 | #endif /* __ASM_ARCH_MEMORY_H */ | 18 | #endif /* __ASM_ARCH_MEMORY_H */ |