Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...

[pandora-kernel.git] / arch / arm / mach-prima2 / l2x0.c

diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c
index 66c6387..c998377 100644 (file)
--- a/arch/arm/mach-prima2/l2x0.c
+++ b/arch/arm/mach-prima2/l2x0.c
@@ -8,51 +8,24 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/errno.h>
 #include <linux/of.h>
-#include <linux/of_address.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#define L2X0_ADDR_FILTERING_START       0xC00
-#define L2X0_ADDR_FILTERING_END         0xC04
-
-static struct of_device_id l2x_ids[]  = {
-       { .compatible = "arm,pl310-cache" },
+static struct of_device_id prima2_l2x0_ids[]  = {
+       { .compatible = "sirf,prima2-pl310-cache" },
+       {},
 };
 
-static int __init sirfsoc_of_l2x_init(void)
+static int __init sirfsoc_l2x0_init(void)
 {
        struct device_node *np;
-       void __iomem *sirfsoc_l2x_base;
-
-       np = of_find_matching_node(NULL, l2x_ids);
-       if (!np)
-               panic("unable to find compatible l2x node in dtb\n");
-
-       sirfsoc_l2x_base = of_iomap(np, 0);
-       if (!sirfsoc_l2x_base)
-               panic("unable to map l2x cpu registers\n");
-
-       of_node_put(np);
-
-       if (!(readl_relaxed(sirfsoc_l2x_base + L2X0_CTRL) & 1)) {
-               /*
-                * set the physical memory windows L2 cache will cover
-                */
-               writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024,
-                       sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
-               writel_relaxed(PHYS_OFFSET | 0x1,
-                       sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
 
-               writel_relaxed(0,
-                       sirfsoc_l2x_base + L2X0_TAG_LATENCY_CTRL);
-               writel_relaxed(0,
-                       sirfsoc_l2x_base + L2X0_DATA_LATENCY_CTRL);
+       np = of_find_matching_node(NULL, prima2_l2x0_ids);
+       if (np) {
+               pr_info("Initializing prima2 L2 cache\n");
+               return l2x0_of_init(0x40000, 0);
        }
-       l2x0_init((void __iomem *)sirfsoc_l2x_base, 0x00040000,
-               0x00000000);
 
        return 0;
 }
-early_initcall(sirfsoc_of_l2x_init);
+early_initcall(sirfsoc_l2x0_init);