aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-04-14 09:47:01 -0400
committerJason Cooper <jason@lakedaemon.net>2014-04-24 01:00:36 -0400
commit5686a1e5aa436c49187a60052d5885fb1f541ce6 (patch)
tree4cc42805d26105ac25227e3129c7911437d2c417 /arch/arm/mach-kirkwood
parent501f928e009760f4987d4630265bb9fff28a6ecc (diff)
bus: mvebu: pass the coherency availability information at init time
Until now, the mvebu-mbus was guessing by itself whether hardware I/O coherency was available or not by poking into the Device Tree to see if the coherency fabric Device Tree node was present or not. However, on some upcoming SoCs, the presence or absence of the coherency fabric DT node isn't sufficient: in CONFIG_SMP, the coherency can be enabled, but not in !CONFIG_SMP. In order to clean this up, the mvebu_mbus_dt_init() function is extended to get a boolean argument telling whether coherency is enabled or not. Therefore, the logic to decide whether coherency is available or not now belongs to the core SoC code instead of the mvebu-mbus driver itself, which is much better. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1397483228-25625-4-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/board-dt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 2801da49e2a3..ff18ff20f71f 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -195,7 +195,7 @@ static void __init kirkwood_dt_init(void)
195{ 195{
196 kirkwood_disable_mbus_error_propagation(); 196 kirkwood_disable_mbus_error_propagation();
197 197
198 BUG_ON(mvebu_mbus_dt_init()); 198 BUG_ON(mvebu_mbus_dt_init(false));
199 199
200#ifdef CONFIG_CACHE_FEROCEON_L2 200#ifdef CONFIG_CACHE_FEROCEON_L2
201 feroceon_of_init(); 201 feroceon_of_init();