Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / arch / arm / mach-cns3xxx / core.c

diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index 2ae28a69e3e55f69de95a0b498ac6acf7c58de70..f85449a6accd9210544952b6f2ce9939f5bed1da 100644 (file)
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -272,9 +272,9 @@ void __init cns3xxx_l2x0_init(void)
         *
         * 1 cycle of latency for setup, read and write accesses
         */
-       val = readl(base + L2X0_TAG_LATENCY_CTRL);
+       val = readl(base + L310_TAG_LATENCY_CTRL);
        val &= 0xfffff888;
-       writel(val, base + L2X0_TAG_LATENCY_CTRL);
+       writel(val, base + L310_TAG_LATENCY_CTRL);
 
        /*
         * Data RAM Control register
@@ -285,12 +285,12 @@ void __init cns3xxx_l2x0_init(void)
         *
         * 1 cycle of latency for setup, read and write accesses
         */
-       val = readl(base + L2X0_DATA_LATENCY_CTRL);
+       val = readl(base + L310_DATA_LATENCY_CTRL);
        val &= 0xfffff888;
-       writel(val, base + L2X0_DATA_LATENCY_CTRL);
+       writel(val, base + L310_DATA_LATENCY_CTRL);
 
        /* 32 KiB, 8-way, parity disable */
-       l2x0_init(base, 0x00540000, 0xfe000fff);
+       l2x0_init(base, 0x00500000, 0xfe0f0fff);
 }
 
 #endif /* CONFIG_CACHE_L2X0 */