From a5d956c92a6681ef76e7dc72bbe9dfcc76b45781 Mon Sep 17 00:00:00 2001
From: Christian Riesch <christian.riesch@omicron.at>
Date: Tue, 28 Jun 2011 15:10:51 +0000
Subject: [PATCH] --- yaml --- r: 260527 b: refs/heads/master c:
 8d54297b90831b6e87e62ad910f833b8666094c8 h: refs/heads/master i:   260525:
 f9883746de603126fc869aec4d44770eee6bb493   260523:
 c50b9b819abada0f8b771a81c52cca8141e025dc   260519:
 982c772564a1376e476be86b01e824c5a73c1d97   260511:
 970125b632992e8ce741d7b559f9499335dcc981 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/Kconfig                  |  2 +-
 trunk/arch/arm/mach-cns3xxx/cns3420vb.c |  2 --
 trunk/arch/arm/mach-cns3xxx/core.c      | 43 -------------------------
 trunk/arch/arm/mach-cns3xxx/core.h      |  6 ----
 trunk/arch/arm/mach-davinci/da850.c     |  1 +
 trunk/arch/arm/mm/Kconfig               |  2 +-
 7 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/[refs] b/[refs]
index e6fe44d65ef7..bf2c931bbf6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93e85d8e902e1a4468c6ade5c6ec3dd3055a489f
+refs/heads/master: 8d54297b90831b6e87e62ad910f833b8666094c8
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index c2e5f3dc65b1..9adc278a22ab 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -321,7 +321,7 @@ config ARCH_CLPS711X
 
 config ARCH_CNS3XXX
 	bool "Cavium Networks CNS3XXX family"
-	select CPU_V6K
+	select CPU_V6
 	select GENERIC_CLOCKEVENTS
 	select ARM_GIC
 	select MIGHT_HAVE_PCI
diff --git a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
index 4b804baa5f80..08e5c8759502 100644
--- a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -170,8 +170,6 @@ static struct platform_device *cns3420_pdevs[] __initdata = {
 
 static void __init cns3420_init(void)
 {
-	cns3xxx_l2x0_init();
-
 	platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs));
 
 	cns3xxx_ahci_init();
diff --git a/trunk/arch/arm/mach-cns3xxx/core.c b/trunk/arch/arm/mach-cns3xxx/core.c
index 941a308e1253..da30078a80c1 100644
--- a/trunk/arch/arm/mach-cns3xxx/core.c
+++ b/trunk/arch/arm/mach-cns3xxx/core.c
@@ -16,7 +16,6 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 #include <asm/hardware/gic.h>
-#include <asm/hardware/cache-l2x0.h>
 #include <mach/cns3xxx.h>
 #include "core.h"
 
@@ -245,45 +244,3 @@ static void __init cns3xxx_timer_init(void)
 struct sys_timer cns3xxx_timer = {
 	.init = cns3xxx_timer_init,
 };
-
-#ifdef CONFIG_CACHE_L2X0
-
-void __init cns3xxx_l2x0_init(void)
-{
-	void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
-	u32 val;
-
-	if (WARN_ON(!base))
-		return;
-
-	/*
-	 * Tag RAM Control register
-	 *
-	 * bit[10:8]	- 1 cycle of write accesses latency
-	 * bit[6:4]	- 1 cycle of read accesses latency
-	 * bit[3:0]	- 1 cycle of setup latency
-	 *
-	 * 1 cycle of latency for setup, read and write accesses
-	 */
-	val = readl(base + L2X0_TAG_LATENCY_CTRL);
-	val &= 0xfffff888;
-	writel(val, base + L2X0_TAG_LATENCY_CTRL);
-
-	/*
-	 * Data RAM Control register
-	 *
-	 * bit[10:8]	- 1 cycles of write accesses latency
-	 * bit[6:4]	- 1 cycles of read accesses latency
-	 * bit[3:0]	- 1 cycle of setup latency
-	 *
-	 * 1 cycle of latency for setup, read and write accesses
-	 */
-	val = readl(base + L2X0_DATA_LATENCY_CTRL);
-	val &= 0xfffff888;
-	writel(val, base + L2X0_DATA_LATENCY_CTRL);
-
-	/* 32 KiB, 8-way, parity disable */
-	l2x0_init(base, 0x00540000, 0xfe000fff);
-}
-
-#endif /* CONFIG_CACHE_L2X0 */
diff --git a/trunk/arch/arm/mach-cns3xxx/core.h b/trunk/arch/arm/mach-cns3xxx/core.h
index fcd225343c61..ffeb3a8b73ba 100644
--- a/trunk/arch/arm/mach-cns3xxx/core.h
+++ b/trunk/arch/arm/mach-cns3xxx/core.h
@@ -13,12 +13,6 @@
 
 extern struct sys_timer cns3xxx_timer;
 
-#ifdef CONFIG_CACHE_L2X0
-void __init cns3xxx_l2x0_init(void);
-#else
-static inline void cns3xxx_l2x0_init(void) {}
-#endif /* CONFIG_CACHE_L2X0 */
-
 void __init cns3xxx_map_io(void);
 void __init cns3xxx_init_irq(void);
 void cns3xxx_power_off(void);
diff --git a/trunk/arch/arm/mach-davinci/da850.c b/trunk/arch/arm/mach-davinci/da850.c
index 133aac405853..4e22b8da3493 100644
--- a/trunk/arch/arm/mach-davinci/da850.c
+++ b/trunk/arch/arm/mach-davinci/da850.c
@@ -58,6 +58,7 @@ static struct pll_data pll0_data = {
 static struct clk ref_clk = {
 	.name		= "ref_clk",
 	.rate		= DA850_REF_FREQ,
+	.set_rate	= davinci_simple_set_rate,
 };
 
 static struct clk pll0_clk = {
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index cb26d49a8cd6..0074b8dba793 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -821,7 +821,7 @@ config CACHE_L2X0
 	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
 		   REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
 		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
-		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || ARCH_CNS3XXX
+		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE
 	default y
 	select OUTER_CACHE
 	select OUTER_CACHE_SYNC