diff options
author | Neil Greatorex <neil@fatboyfat.co.uk> | 2013-03-30 16:41:20 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-03-30 17:11:40 -0400 |
commit | fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f (patch) | |
tree | 76242a321773f370f5755a0bcb5185b15fc89581 /drivers/bus/mvebu-mbus.c | |
parent | fddddb52a6c4e2438f4514ed979183653ca0732a (diff) |
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/mvebu-mbus.c')
-rw-r--r-- | drivers/bus/mvebu-mbus.c | 3 |
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, | |||
858 | return -ENOMEM; | 858 | return -ENOMEM; |
859 | } | 859 | } |
860 | 860 | ||
861 | if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric")) | ||
862 | mbus->hw_io_coherency = 1; | ||
863 | |||
861 | for (win = 0; win < mbus->soc->num_wins; win++) | 864 | for (win = 0; win < mbus->soc->num_wins; win++) |
862 | mvebu_mbus_disable_window(mbus, win); | 865 | mvebu_mbus_disable_window(mbus, win); |
863 | 866 | ||