diff options
| author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 11:04:24 -0400 |
|---|---|---|
| committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 08:00:11 -0400 |
| commit | f407c2e38e5f07d2e8f573fc55a5d996568f6e50 (patch) | |
| tree | 6d4e0d0a459280407a12c28078c3d4592bace1c9 | |
| parent | d70a5969e9d52ef1c0e19a1b154785f8e1acba29 (diff) | |
ARM: mach-at91: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Ferre<nicolas.ferre@atmel.com>
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index e04c5fb6f1ee..1532b508c814 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
| 15 | #include <linux/dma-mapping.h> | ||
| 15 | 16 | ||
| 16 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
| 17 | #include <asm/mach/arch.h> | 18 | #include <asm/mach/arch.h> |
| @@ -319,6 +320,7 @@ static void at91sam9g45_poweroff(void) | |||
| 319 | static void __init at91sam9g45_map_io(void) | 320 | static void __init at91sam9g45_map_io(void) |
| 320 | { | 321 | { |
| 321 | at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE); | 322 | at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE); |
| 323 | init_consistent_dma_size(SZ_4M); | ||
| 322 | } | 324 | } |
| 323 | 325 | ||
| 324 | static void __init at91sam9g45_initialize(void) | 326 | static void __init at91sam9g45_initialize(void) |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h index 2c611b9a0138..406bb6496805 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h | |||
| @@ -128,8 +128,6 @@ | |||
| 128 | #define AT91SAM9G45_EHCI_BASE 0x00800000 /* USB Host controller (EHCI) */ | 128 | #define AT91SAM9G45_EHCI_BASE 0x00800000 /* USB Host controller (EHCI) */ |
| 129 | #define AT91SAM9G45_VDEC_BASE 0x00900000 /* Video Decoder Controller */ | 129 | #define AT91SAM9G45_VDEC_BASE 0x00900000 /* Video Decoder Controller */ |
| 130 | 130 | ||
| 131 | #define CONSISTENT_DMA_SIZE SZ_4M | ||
| 132 | |||
| 133 | /* | 131 | /* |
| 134 | * DMA peripheral identifiers | 132 | * DMA peripheral identifiers |
| 135 | * for hardware handshaking interface | 133 | * for hardware handshaking interface |
