From 2154468ee35a7f9bdbee72cb6e5a887ad6f4bd81 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Wed, 28 Apr 2010 10:59:45 -0400
Subject: [PATCH] --- yaml --- r: 191895 b: refs/heads/master c:
 66b196475031c748a5861390a4fadb915e14ccdc h: refs/heads/master i:   191893:
 856bf17283af833763a12a00a5af246c8942d7ed   191891:
 4559a98eb3fa286e8d49a9c8e85ec0fd7d5553f2   191887:
 b9684ff9195da2600d3730af4a25e812b8c57a04 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/configs/mmp2_defconfig | 2 ++
 trunk/arch/arm/mach-mmp/mmp2.c        | 5 +++++
 trunk/arch/arm/mm/Kconfig             | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f659b00ba5f0..df6e5ed23eab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e598863690d956ad4e18904bb5b6c63fea1ad255
+refs/heads/master: 66b196475031c748a5861390a4fadb915e14ccdc
diff --git a/trunk/arch/arm/configs/mmp2_defconfig b/trunk/arch/arm/configs/mmp2_defconfig
index 03f76cfc941c..db8936370b6b 100644
--- a/trunk/arch/arm/configs/mmp2_defconfig
+++ b/trunk/arch/arm/configs/mmp2_defconfig
@@ -246,6 +246,8 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_OUTER_CACHE=y
+CONFIG_CACHE_TAUROS2=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 # CONFIG_ARM_ERRATA_411920 is not set
 CONFIG_COMMON_CLKDEV=y
diff --git a/trunk/arch/arm/mach-mmp/mmp2.c b/trunk/arch/arm/mach-mmp/mmp2.c
index cca39929110f..e236ec0c54f6 100644
--- a/trunk/arch/arm/mach-mmp/mmp2.c
+++ b/trunk/arch/arm/mach-mmp/mmp2.c
@@ -15,6 +15,8 @@
 #include <linux/init.h>
 #include <linux/io.h>
 
+#include <asm/hardware/cache-tauros2.h>
+
 #include <mach/addr-map.h>
 #include <mach/regs-apbc.h>
 #include <mach/regs-apmu.h>
@@ -99,6 +101,9 @@ static struct clk_lookup mmp2_clkregs[] = {
 static int __init mmp2_init(void)
 {
 	if (cpu_is_mmp2()) {
+#ifdef CONFIG_CACHE_TAUROS2
+		tauros2_init();
+#endif
 		mfp_init_base(MFPR_VIRT_BASE);
 		mfp_init_addr(mmp2_addr_map);
 		clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs));
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index 5bd7c89a6045..698912602387 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -769,7 +769,7 @@ config CACHE_L2X0
 
 config CACHE_TAUROS2
 	bool "Enable the Tauros2 L2 cache controller"
-	depends on ARCH_DOVE
+	depends on (ARCH_DOVE || ARCH_MMP)
 	default y
 	select OUTER_CACHE
 	help