summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-03-01 15:45:16 +0100
committerPaul Mundt <lethal@linux-sh.org>2012-03-07 17:04:29 +0900
commit1740d3448012475f6b63172631c60cbcd1994a81 (patch)
treeaeeacbda292c52403c0eee663e2f3ecef4177ce6 /arch
parente9db93a4711bb0586f6786f21274c3b74d8b608b (diff)
downloadlinux-1740d3448012475f6b63172631c60cbcd1994a81.tar.gz
linux-1740d3448012475f6b63172631c60cbcd1994a81.tar.bz2
linux-1740d3448012475f6b63172631c60cbcd1994a81.zip
ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer
The default 2MB size of DMA coherent memory isn't enough for allocate frame buffer memory. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index a2813247b455..7b53cda41851 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1352,6 +1352,10 @@ static struct map_desc mackerel_io_desc[] __initdata = {
static void __init mackerel_map_io(void)
{
iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));
+ /* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
+ * enough to allocate the frame buffer memory.
+ */
+ init_consistent_dma_size(12 << 20);
/* setup early devices and console here as well */
sh7372_add_early_devices();