summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorNeil Greatorex <neil@fatboyfat.co.uk>2013-03-30 20:41:20 +0000
committerJason Cooper <jason@lakedaemon.net>2013-03-30 21:11:40 +0000
commitfe0cd96c009b14cc85d41a97f84a6453e4bbfd7f (patch)
tree76242a321773f370f5755a0bcb5185b15fc89581 /drivers/bus
parentfddddb52a6c4e2438f4514ed979183653ca0732a (diff)
downloadblackbird-op-linux-fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f.tar.gz
blackbird-op-linux-fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f.zip
bus: mvebu-mbus: Restore checking for coherency fabric hardware
The new mvebu-mbus driver was not checking the device tree for coherency fabric hardware and hence was not setting the hw_io_coherency flag in mbus_state. This prevented the mvsdio driver from operating correctly. This patch restores the check. Signed-off-by: Neil Greatorex <neil@fatboyfat.co.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/mvebu-mbus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 586d03e29e9e..a0250c65440e 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/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);
OpenPOWER on IntegriCloud