ARM: mach-at91: Setup consistent dma size at boot time
authorJon Medhurst <tixy@yxit.co.uk>
Thu, 4 Aug 2011 15:04:24 +0000 (16:04 +0100)
committerJon Medhurst <tixy@yxit.co.uk>
Mon, 22 Aug 2011 12:00:11 +0000 (12:00 +0000)
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Ferre<nicolas.ferre@atmel.com>
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/include/mach/at91sam9g45.h

index e04c5fb6f1ee36bd4e652dc3640f776fd31a9bf4..1532b508c8142408d2cb3ba3e33ee3c6fb955a40 100644 (file)
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/pm.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -319,6 +320,7 @@ static void at91sam9g45_poweroff(void)
 static void __init at91sam9g45_map_io(void)
 {
        at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);
+       init_consistent_dma_size(SZ_4M);
 }
 
 static void __init at91sam9g45_initialize(void)
index 2c611b9a01389a7915734e590bbd7caee2acebf9..406bb6496805f38e82790157b98b82b98622a366 100644 (file)
 #define AT91SAM9G45_EHCI_BASE  0x00800000      /* USB Host controller (EHCI) */
 #define AT91SAM9G45_VDEC_BASE  0x00900000      /* Video Decoder Controller */
 
-#define CONSISTENT_DMA_SIZE    SZ_4M
-
 /*
  * DMA peripheral identifiers
  * for hardware handshaking interface