ARM: mvebu: add Armada 375 support to the coherency code

The Armada 375, like the Armada 370 and Armada XP, has a coherency
unit. However, unlike the coherency unit of 370/XP which does both CPU
and I/O coherency, the one on Armada 735 only does I/O
coherency. Therefore, instead of having two sets of registers (the
first one being used mainly to register each CPU in the coherency
fabric, the second one being used for the I/O coherency barrier), it
has only one set of register (for the I/O coherency barrier).

This commit adds a new "marvell,armada-375-coherency-fabric"
compatible string for this variant of the coherency fabric. The custom
DMA operations, and the way of triggering an I/O barrier is the same
as Armada 370/XP, so the code changes are minimal. However, the
set_cpu_coherent() function is not needed on Armada 375 and will not
work.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397483228-25625-7-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

1 files changed, 14 insertions, 0 deletions

diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 862100f7c836..7ccaf87fd772 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -41,11 +41,14 @@ static void __iomem *coherency_cpu_base;
 enum {
         COHERENCY_FABRIC_TYPE_NONE,
         COHERENCY_FABRIC_TYPE_ARMADA_370_XP,
+        COHERENCY_FABRIC_TYPE_ARMADA_375,
 };
 
 static struct of_device_id of_coherency_table[] = {
         {.compatible = "marvell,coherency-fabric",
          .data = (void *) COHERENCY_FABRIC_TYPE_ARMADA_370_XP },
+        {.compatible = "marvell,armada-375-coherency-fabric",
+         .data = (void *) COHERENCY_FABRIC_TYPE_ARMADA_375 },
         { /* end of list */ },
 };
 
@@ -145,6 +148,11 @@ static void __init armada_370_coherency_init(struct device_node *np)
         set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
 }
 
+static void __init armada_375_coherency_init(struct device_node *np)
+{
+        coherency_cpu_base = of_iomap(np, 0);
+}
+
 static int coherency_type(void)
 {
         struct device_node *np;
@@ -158,6 +166,10 @@ static int coherency_type(void)
                 if (type == COHERENCY_FABRIC_TYPE_ARMADA_370_XP)
                         return type;
 
+                /* Armada 375 coherency works only on SMP */
+                else if (type == COHERENCY_FABRIC_TYPE_ARMADA_375 && is_smp())
+                        return type;
+
                 of_node_put(np);
         }
 
@@ -178,6 +190,8 @@ int __init coherency_init(void)
 
         if (type == COHERENCY_FABRIC_TYPE_ARMADA_370_XP)
                 armada_370_coherency_init(np);
+        else if (type == COHERENCY_FABRIC_TYPE_ARMADA_375)
+                armada_375_coherency_init(np);
 
         return 0;
 }