diff options
| author | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-04 11:41:43 -0400 |
|---|---|---|
| committer | Jon Medhurst <tixy@yxit.co.uk> | 2011-08-22 08:00:10 -0400 |
| commit | 284dc060084d93f56c2b80b79eac61c653dccd85 (patch) | |
| tree | 40a6e3a4c2c117cb1ed07fdb2bea9bba19af0a6d | |
| parent | 009426a0ebd0fc4a230ab2c2295dbc8f7ba7e8dd (diff) | |
ARM: mach-s3c64xx: Setup consistent dma size at boot time
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c64xx/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/memory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c index 374e45e566b8..8dc05763a7eb 100644 --- a/arch/arm/mach-s3c64xx/cpu.c +++ b/arch/arm/mach-s3c64xx/cpu.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/dma-mapping.h> | ||
| 23 | 24 | ||
| 24 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
| 25 | #include <mach/map.h> | 26 | #include <mach/map.h> |
| @@ -145,6 +146,7 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size) | |||
| 145 | /* initialise the io descriptors we need for initialisation */ | 146 | /* initialise the io descriptors we need for initialisation */ |
| 146 | iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); | 147 | iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); |
| 147 | iotable_init(mach_desc, size); | 148 | iotable_init(mach_desc, size); |
| 149 | init_consistent_dma_size(SZ_8M); | ||
| 148 | 150 | ||
| 149 | idcode = __raw_readl(S3C_VA_SYS + 0x118); | 151 | idcode = __raw_readl(S3C_VA_SYS + 0x118); |
| 150 | if (!idcode) { | 152 | if (!idcode) { |
diff --git a/arch/arm/mach-s3c64xx/include/mach/memory.h b/arch/arm/mach-s3c64xx/include/mach/memory.h index 4760cdae1eb6..b704669f95ff 100644 --- a/arch/arm/mach-s3c64xx/include/mach/memory.h +++ b/arch/arm/mach-s3c64xx/include/mach/memory.h | |||
| @@ -15,6 +15,4 @@ | |||
| 15 | 15 | ||
| 16 | #define PLAT_PHYS_OFFSET UL(0x50000000) | 16 | #define PLAT_PHYS_OFFSET UL(0x50000000) |
| 17 | 17 | ||
| 18 | #define CONSISTENT_DMA_SIZE SZ_8M | ||
| 19 | |||
| 20 | #endif | 18 | #endif |
