aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-09-24 07:54:33 +0200
committerOlof Johansson <olof@lixom.net>2012-09-26 16:48:47 -0700
commit84d5dfbf09be6be71d6dda63d99a8303e85663c7 (patch)
tree0350a7ed6c06b2aecaa05fcd3501fac4277eaa7d /arch/arm/mach-orion5x
parentMerge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes (diff)
downloadlinux-dev-84d5dfbf09be6be71d6dda63d99a8303e85663c7.tar.xz
linux-dev-84d5dfbf09be6be71d6dda63d99a8303e85663c7.zip
ARM: Orion5x: Fix too small coherent pool.
Some Orion5x devices allocate their coherent buffers from atomic context. Increase size of atomic coherent pool to make sure such the allocations won't fail during boot. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r--arch/arm/mach-orion5x/common.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 410291c67666..a6cd14ab1e4e 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -204,6 +204,13 @@ void __init orion5x_wdt_init(void)
void __init orion5x_init_early(void)
{
orion_time_set_base(TIMER_VIRT_BASE);
+
+ /*
+ * Some Orion5x devices allocate their coherent buffers from atomic
+ * context. Increase size of atomic coherent pool to make sure such
+ * the allocations won't fail.
+ */
+ init_dma_coherent_pool_size(SZ_1M);
}
int orion5x_tclk;