From: Neil Greatorex Date: Sat, 30 Mar 2013 20:41:20 +0000 (+0000) Subject: bus: mvebu-mbus: Restore checking for coherency fabric hardware X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f;p=linux-edison.git 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 Signed-off-by: Jason Cooper --- diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 586d03e29e9..a0250c65440 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);