From 916c2d1b112607d5f9395819faf7364c16af93a9 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 1 Mar 2012 15:45:16 +0100 Subject: [PATCH] --- yaml --- r: 288404 b: refs/heads/master c: 1740d3448012475f6b63172631c60cbcd1994a81 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 454ef26ee177..f5df6baef6b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9db93a4711bb0586f6786f21274c3b74d8b608b +refs/heads/master: 1740d3448012475f6b63172631c60cbcd1994a81 diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c index a2813247b455..7b53cda41851 100644 --- a/trunk/arch/arm/mach-shmobile/board-mackerel.c +++ b/trunk/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();