Commit e556cb3e authored Sep 27, 2012 by Linus Torvalds

arm-soc

Pull one more arm-soc bugfix from Olof Johansson:
 "Here's a bugfix for orion5x.  Without this, PCI doesn't initialize
  properly because of too small coherent pool to cover the allocations
  needed.

  A similar fix has already been done on kirkwood."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: Orion5x: Fix too small coherent pool.

parents b56adb54 84d5dfbf

arch/arm/mach-orion5x/common.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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;