From 55bb57e3233b68778b29d90cc8b48db495ba4555 Mon Sep 17 00:00:00 2001
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: Tue, 25 Sep 2012 02:02:14 +0200
Subject: [PATCH] --- yaml --- r: 334631 b: refs/heads/master c:
 fd57c65cbc26f58b78169b35b2ff25152750339f h: refs/heads/master i:   334629:
 e091afdd44f7aac56a906977b234b28693066f8b   334627:
 2ae4fecdb479d7dd197203d43faaf31a5542d8a5   334623:
 c54ae10642d334a7b2f14eb522a5897366621583 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/boot/dts/dove.dtsi | 5 +++++
 trunk/arch/arm/mach-dove/common.c | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2aade8c027b..28c958605222 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 529b89ef7ff898397ff3a44b527816a82d0c699c
+refs/heads/master: fd57c65cbc26f58b78169b35b2ff25152750339f
diff --git a/trunk/arch/arm/boot/dts/dove.dtsi b/trunk/arch/arm/boot/dts/dove.dtsi
index 96fb824b5e6e..3f41f503b750 100644
--- a/trunk/arch/arm/boot/dts/dove.dtsi
+++ b/trunk/arch/arm/boot/dts/dove.dtsi
@@ -20,6 +20,11 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
+		l2: l2-cache {
+			compatible = "marvell,tauros2-cache";
+			marvell,tauros2-cache-features = <0>;
+		};
+
 		uart0: serial@12000 {
 			compatible = "ns16550a";
 			reg = <0x12000 0x100>;
diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c
index b37bef1d5ffa..343a4bcc6d92 100644
--- a/trunk/arch/arm/mach-dove/common.c
+++ b/trunk/arch/arm/mach-dove/common.c
@@ -32,6 +32,7 @@
 #include <linux/irq.h>
 #include <plat/time.h>
 #include <linux/platform_data/usb-ehci-orion.h>
+#include <plat/irq.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
 #include "common.h"
@@ -399,7 +400,7 @@ static void __init dove_dt_init(void)
 		(dove_tclk + 499999) / 1000000);
 
 #ifdef CONFIG_CACHE_TAUROS2
-	tauros2_init();
+	tauros2_init(0);
 #endif
 	dove_setup_cpu_mbus();