---

yaml --- r: 100765 b: refs/heads/master c: 1338760 h: refs/heads/master i: 100763: f649f89 v: v3
git-mirror · Jun 30, 2008 · 0c4a829 · 0c4a829
1 parent 682a8f5
commit 0c4a829
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a10b188f195d00116f56f0049d8b17c711641fb7
+refs/heads/master: 1338760329c586e0141831099e15f5c336dd9c1d
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
@@ -313,6 +313,11 @@ static char * __init kirkwood_id(void)
 	return "unknown 88F6000 variant";
 }
 
+static int __init is_l2_writethrough(void)
+{
+	return !!(readl(L2_CONFIG_REG) & L2_WRITETHROUGH);
+}
+
 void __init kirkwood_init(void)
 {
 	printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n",
@@ -321,6 +326,6 @@ void __init kirkwood_init(void)
 	kirkwood_setup_cpu_mbus();
 
 #ifdef CONFIG_CACHE_FEROCEON_L2
-	feroceon_l2_init(1);
+	feroceon_l2_init(is_l2_writethrough());
 #endif
 }
diff --git a/trunk/include/asm-arm/arch-kirkwood/kirkwood.h b/trunk/include/asm-arm/arch-kirkwood/kirkwood.h
@@ -49,7 +49,6 @@
 #define BRIDGE_VIRT_BASE	(KIRKWOOD_REGS_VIRT_BASE | 0x20000)
 #define  CPU_CONTROL		(BRIDGE_VIRT_BASE | 0x0104)
 #define   CPU_RESET		0x00000002
-//#define   L2_WRITETHROUGH	0x00020000
 #define  RSTOUTn_MASK		(BRIDGE_VIRT_BASE | 0x0108)
 #define   SOFT_RESET_OUT_EN	0x00000004
 #define  SYSTEM_SOFT_RESET	(BRIDGE_VIRT_BASE | 0x010c)
@@ -65,6 +64,8 @@
 #define   IRQ_CAUSE_HIGH_OFF	0x0010
 #define   IRQ_MASK_HIGH_OFF	0x0014
 #define  TIMER_VIRT_BASE	(BRIDGE_VIRT_BASE | 0x0300)
+#define  L2_CONFIG_REG		(BRIDGE_VIRT_BASE | 0x0128)
+#define   L2_WRITETHROUGH	0x00000010
 
 /*
  * Register Map