From 9c7a7de8c750b6f709a2f2357cfa854d7ea4b951 Mon Sep 17 00:00:00 2001 From: Neil Greatorex Date: Sat, 30 Mar 2013 20:41:20 +0000 Subject: [PATCH] --- yaml --- r: 373941 b: refs/heads/master c: fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f h: refs/heads/master i: 373939: a42aa8008b19483190b40163a0243548f27ea759 v: v3 --- [refs] | 2 +- trunk/drivers/bus/mvebu-mbus.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab996cf3ca3f..9ae699c73972 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fddddb52a6c4e2438f4514ed979183653ca0732a +refs/heads/master: fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f diff --git a/trunk/drivers/bus/mvebu-mbus.c b/trunk/drivers/bus/mvebu-mbus.c index 586d03e29e9e..a0250c65440e 100644 --- a/trunk/drivers/bus/mvebu-mbus.c +++ b/trunk/drivers/bus/mvebu-mbus.c @@ -858,6 +858,9 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, return -ENOMEM; } + if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric")) + mbus->hw_io_coherency = 1; + for (win = 0; win < mbus->soc->num_wins; win++) mvebu_mbus_disable_window(mbus, win);