ARM: mach-s3c64xx: Setup consistent dma size at boot time
authorJon Medhurst <tixy@yxit.co.uk>
Thu, 4 Aug 2011 15:41:43 +0000 (16:41 +0100)
committerJon Medhurst <tixy@yxit.co.uk>
Mon, 22 Aug 2011 12:00:10 +0000 (12:00 +0000)
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Ben Dooks <ben-linux@fluff.org>
arch/arm/mach-s3c64xx/cpu.c
arch/arm/mach-s3c64xx/include/mach/memory.h

index 374e45e566b8cd66c97672b7d8471af61a2363b3..8dc05763a7ebe97d5d085d8624fa8f09bd1c8991 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/dma-mapping.h>
 
 #include <mach/hardware.h>
 #include <mach/map.h>
@@ -145,6 +146,7 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
        /* initialise the io descriptors we need for initialisation */
        iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
        iotable_init(mach_desc, size);
+       init_consistent_dma_size(SZ_8M);
 
        idcode = __raw_readl(S3C_VA_SYS + 0x118);
        if (!idcode) {
index 4760cdae1eb645b29d59d59392e67acf20da9ee9..b704669f95ff53508a3daac5e7f3947e2269456a 100644 (file)
@@ -15,6 +15,4 @@
 
 #define PLAT_PHYS_OFFSET     UL(0x50000000)
 
-#define CONSISTENT_DMA_SIZE    SZ_8M
-
 #endif