Commit 764e2c70 authored Jan 28, 2015 by Olof Johansson

linux-mvebu into fixes

Merge "mvebu-fixes-6" from Andrew Lunn:

The previous fix for Armada XP, disabling I/O coherency, broke Armada
375/38x.  Only switch the PL310 to I/O coherent mode if I/O coherency
is enabled.

* tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled

Signed-off-by: Olof Johansson <olof@lixom.net>

parents c6e3324e dcad6887

arch/arm/mach-mvebu/coherency.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,13 @@ static void __init armada_375_380_coherency_init(struct device_node *np)
		coherency_cpu_base = of_iomap(np, 0);
		arch_ioremap_caller = armada_pcie_wa_ioremap_caller;

		/*
		* We should switch the PL310 to I/O coherency mode only if
		* I/O coherency is actually enabled.
		*/
		if (!coherency_available())
		return;

		/*
		* Add the PL310 property "arm,io-coherent". This makes sure the
		* outer sync operation is not used, which allows to