Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

[karo-tx-linux.git] / arch / arm / mach-picoxcell / common.c

diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 8f9a0b47a7fa8293860036c09516854109a310f1..f6c0849af5e9e374cd1639e3da0fcec952756391 100644 (file)
--- a/arch/arm/mach-picoxcell/common.c
+++ b/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;
 
 /*