瀏覽代碼

ARM: dove: Fix tauros2 device tree init

During the review process of dove DT patches, Tauros2 cache
init call was changed and DT support added. This patch fixes
the call to Tauros2 init and adds a DT node. Moreover, plat/irq.h
include was missing from mach-dove/common.c.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Sebastian Hesselbarth 13 年之前
父節點
當前提交
fd57c65cbc
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 5 0
      arch/arm/boot/dts/dove.dtsi
  2. 2 1
      arch/arm/mach-dove/common.c

+ 5 - 0
arch/arm/boot/dts/dove.dtsi

@@ -20,6 +20,11 @@
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 
 
+		l2: l2-cache {
+			compatible = "marvell,tauros2-cache";
+			marvell,tauros2-cache-features = <0>;
+		};
+
 		uart0: serial@12000 {
 		uart0: serial@12000 {
 			compatible = "ns16550a";
 			compatible = "ns16550a";
 			reg = <0x12000 0x100>;
 			reg = <0x12000 0x100>;

+ 2 - 1
arch/arm/mach-dove/common.c

@@ -32,6 +32,7 @@
 #include <linux/irq.h>
 #include <linux/irq.h>
 #include <plat/time.h>
 #include <plat/time.h>
 #include <linux/platform_data/usb-ehci-orion.h>
 #include <linux/platform_data/usb-ehci-orion.h>
+#include <plat/irq.h>
 #include <plat/common.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
 #include <plat/addr-map.h>
 #include "common.h"
 #include "common.h"
@@ -399,7 +400,7 @@ static void __init dove_dt_init(void)
 		(dove_tclk + 499999) / 1000000);
 		(dove_tclk + 499999) / 1000000);
 
 
 #ifdef CONFIG_CACHE_TAUROS2
 #ifdef CONFIG_CACHE_TAUROS2
-	tauros2_init();
+	tauros2_init(0);
 #endif
 #endif
 	dove_setup_cpu_mbus();
 	dove_setup_cpu_mbus();