---

yaml --- r: 327106 b: refs/heads/master c: 06413f1 h: refs/heads/master v: v3
git-mirror · Sep 14, 2012 · 3c58bc5 · 3c58bc5
1 parent dcb86cc
commit 3c58bc5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 57 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 360a0cab50414ee30924917159066e69ee4b38d3
+refs/heads/master: 06413f1e31b992b55bfd8a38346243ca80d621cd
diff --git a/trunk/arch/arm/mach-picoxcell/common.c b/trunk/arch/arm/mach-picoxcell/common.c
@@ -20,14 +20,15 @@
 #include <asm/hardware/vic.h>
 #include <asm/mach/map.h>
 
-#include <mach/map.h>
-#include <mach/picoxcell_soc.h>
-
 #include "common.h"
 
-#define WDT_CTRL_REG_EN_MASK	(1 << 0)
-#define WDT_CTRL_REG_OFFS	(0x00)
-#define WDT_TIMEOUT_REG_OFFS	(0x04)
+#define PHYS_TO_IO(x)			(((x) & 0x00ffffff) | 0xfe000000)
+#define PICOXCELL_PERIPH_BASE		0x80000000
+#define PICOXCELL_PERIPH_LENGTH		SZ_4M
+
+#define WDT_CTRL_REG_EN_MASK		(1 << 0)
+#define WDT_CTRL_REG_OFFS		(0x00)
+#define WDT_TIMEOUT_REG_OFFS		(0x04)
 static void __iomem *wdt_regs;
 
 /*

diff --git a/trunk/arch/arm/mach-picoxcell/include/mach/map.h b/trunk/arch/arm/mach-picoxcell/include/mach/map.h
diff --git a/trunk/arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h b/trunk/arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h