Merge branch 'depends/rmk/memory_h' into next/cleanup2

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-s3c64xx / cpu.c

diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c
index cefd7f6dd4f3052567b8620eefdb149dc0341064..de085b798aa47572ba6827dff79dd82b5d395809 100644 (file)
--- a/arch/arm/mach-s3c64xx/cpu.c
+++ b/arch/arm/mach-s3c64xx/cpu.c
@@ -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>
@@ -143,6 +144,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);
 
        /* detect cpu id */
        s3c64xx_init_cpu();