diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-28 14:59:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-28 14:59:33 -0800 |
| commit | 764e2c70eff2251e818537ac59f2365d0e4cf524 (patch) | |
| tree | 301d61cb559ce4d2baade87bfdc9c6e62c510338 /arch | |
| parent | c6e3324e3b3e2516e8b698d0983c4c0f5a1293a8 (diff) | |
| parent | dcad68876c21bac709b01eda24e39d4410dc36a8 (diff) | |
Merge tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index caa21e9b8cd9..ccef8806bb58 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -190,6 +190,13 @@ static void __init armada_375_380_coherency_init(struct device_node *np) 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 * workaround the system erratum that causes deadlocks when |