diff options
Diffstat (limited to 'arch/arm/mach-omap1/reset.c')
-rw-r--r-- | arch/arm/mach-omap1/reset.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c index a0a9f97772ea..5eebd7e889d0 100644 --- a/arch/arm/mach-omap1/reset.c +++ b/arch/arm/mach-omap1/reset.c | |||
@@ -4,10 +4,9 @@ | |||
4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
5 | #include <linux/io.h> | 5 | #include <linux/io.h> |
6 | 6 | ||
7 | #include <plat/prcm.h> | ||
8 | |||
9 | #include <mach/hardware.h> | 7 | #include <mach/hardware.h> |
10 | 8 | ||
9 | #include "iomap.h" | ||
11 | #include "common.h" | 10 | #include "common.h" |
12 | 11 | ||
13 | /* ARM_SYSST bit shifts related to SoC reset sources */ | 12 | /* ARM_SYSST bit shifts related to SoC reset sources */ |
@@ -43,12 +42,12 @@ void omap1_restart(char mode, const char *cmd) | |||
43 | * Returns bits that represent the last reset source for the SoC. The | 42 | * Returns bits that represent the last reset source for the SoC. The |
44 | * format is standardized across OMAPs for use by the OMAP watchdog. | 43 | * format is standardized across OMAPs for use by the OMAP watchdog. |
45 | */ | 44 | */ |
46 | int omap1_get_reset_sources(void) | 45 | u32 omap1_get_reset_sources(void) |
47 | { | 46 | { |
48 | int ret = 0; | 47 | u32 ret = 0; |
49 | u16 rs; | 48 | u16 rs; |
50 | 49 | ||
51 | rs = __raw_readw(ARM_SYSST); | 50 | rs = __raw_readw(OMAP1_IO_ADDRESS(ARM_SYSST)); |
52 | 51 | ||
53 | if (rs & (1 << ARM_SYSST_POR_SHIFT)) | 52 | if (rs & (1 << ARM_SYSST_POR_SHIFT)) |
54 | ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT; | 53 | ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT; |