1 files changed, 24 insertions, 5 deletions

diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c
index c99837797d76..cbcbe9cb094c 100644
--- a/arch/arm/mach-prima2/l2x0.c
+++ b/arch/arm/mach-prima2/l2x0.c
@@ -11,19 +11,38 @@
 #include <linux/of.h>
 #include <asm/hardware/cache-l2x0.h>
 
-static struct of_device_id prima2_l2x0_ids[]  = {
-        { .compatible = "sirf,prima2-pl310-cache" },
+struct l2x0_aux
+{
+        u32 val;
+        u32 mask;
+};
+
+static struct l2x0_aux prima2_l2x0_aux __initconst = {
+        .val = 2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT,
+        .mask = 0,
+};
+
+static struct l2x0_aux marco_l2x0_aux __initconst = {
+        .val = (2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) |
+                (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT),
+        .mask = L2X0_AUX_CTRL_MASK,
+};
+
+static struct of_device_id sirf_l2x0_ids[] __initconst = {
+        { .compatible = "sirf,prima2-pl310-cache", .data = &prima2_l2x0_aux, },
+        { .compatible = "sirf,marco-pl310-cache", .data = &marco_l2x0_aux, },
         {},
 };
 
 static int __init sirfsoc_l2x0_init(void)
 {
         struct device_node *np;
+        const struct l2x0_aux *aux;
 
-        np = of_find_matching_node(NULL, prima2_l2x0_ids);
+        np = of_find_matching_node(NULL, sirf_l2x0_ids);
         if (np) {
-                pr_info("Initializing prima2 L2 cache\n");
-                return l2x0_of_init(0x40000, 0);
+                aux = of_match_node(sirf_l2x0_ids, np)->data;
+                return l2x0_of_init(aux->val, aux->mask);
         }
 
         return 0;