diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:45 +0100 |
| commit | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (patch) | |
| tree | a8318a34fbbb373403239b12e4ac921ab375e9a9 /arch/arm/mach-s5p64x0 | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
| parent | 97fef8bda9f32a2b1919501122d6bd6871af06dc (diff) | |
| download | kernel_samsung_smdk4412-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.zip kernel_samsung_smdk4412-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.tar.gz kernel_samsung_smdk4412-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.tar.bz2 | |
Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s5p64x0')
| -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 a5c0095..8a93854 100644 --- a/arch/arm/mach-s5p64x0/cpu.c +++ b/arch/arm/mach-s5p64x0/cpu.c @@ -20,6 +20,7 @@ #include <linux/serial_core.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> @@ -111,6 +112,7 @@ void __init s5p6440_map_io(void) iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc)); + init_consistent_dma_size(SZ_8M); } void __init s5p6450_map_io(void) @@ -120,6 +122,7 @@ void __init s5p6450_map_io(void) iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc)); + init_consistent_dma_size(SZ_8M); } /* diff --git a/arch/arm/mach-s5p64x0/include/mach/memory.h b/arch/arm/mach-s5p64x0/include/mach/memory.h index 365a6eb..b14cbc3 100644 --- a/arch/arm/mach-s5p64x0/include/mach/memory.h +++ b/arch/arm/mach-s5p64x0/include/mach/memory.h @@ -14,6 +14,5 @@ #define __ASM_ARCH_MEMORY_H __FILE__ #define PLAT_PHYS_OFFSET UL(0x20000000) -#define CONSISTENT_DMA_SIZE SZ_8M #endif /* __ASM_ARCH_MEMORY_H */ |