diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-08-27 07:38:35 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-09-14 16:22:05 +0200 |
| commit | 06413f1e31b992b55bfd8a38346243ca80d621cd (patch) | |
| tree | b6bba41cde8020d9ad1122eeef99055176d9b2bc /arch/arm/mach-picoxcell/common.c | |
| parent | ARM: move all dtb targets out of Makefile.boot (diff) | |
| download | linux-06413f1e31b992b55bfd8a38346243ca80d621cd.tar.xz linux-06413f1e31b992b55bfd8a38346243ca80d621cd.zip | |
ARM: picoxcell: remove dependency on mach/* headers
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
[Jamie Iles: rework to fold picoxcell_soc.h in common.c]
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Diffstat (limited to 'arch/arm/mach-picoxcell/common.c')
| -rw-r--r-- | arch/arm/mach-picoxcell/common.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index 8f9a0b47a7fa..f6c0849af5e9 100644 --- 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; /* |