ARM: PRIMA2: initialize l2x0 according to mach from DT

prima2 and marco have diffetent l2 cache configuration, so
we initialize l2x0 cache based on dtb given to kernel.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>

diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c
index c99837797d76b6fb3d254c8aaa97cd860cd77e4e..cbcbe9cb094c480a928d22ad23642eec3ecc0178 100644 (file)
--- 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;