aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap1/common.h2
-rw-r--r--arch/arm/mach-omap1/reset.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index d6ac18d04da7..ecd0bb664dad 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -94,6 +94,6 @@ extern int ocpi_enable(void);
94static inline int ocpi_enable(void) { return 0; } 94static inline int ocpi_enable(void) { return 0; }
95#endif 95#endif
96 96
97extern int omap1_get_reset_sources(void); 97extern u32 omap1_get_reset_sources(void);
98 98
99#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */ 99#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */
diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c
index a0a9f97772ea..cf8da1cd9b04 100644
--- a/arch/arm/mach-omap1/reset.c
+++ b/arch/arm/mach-omap1/reset.c
@@ -8,6 +8,7 @@
8 8
9#include <mach/hardware.h> 9#include <mach/hardware.h>
10 10
11#include "iomap.h"
11#include "common.h" 12#include "common.h"
12 13
13/* ARM_SYSST bit shifts related to SoC reset sources */ 14/* ARM_SYSST bit shifts related to SoC reset sources */
@@ -43,12 +44,12 @@ void omap1_restart(char mode, const char *cmd)
43 * Returns bits that represent the last reset source for the SoC. The 44 * Returns bits that represent the last reset source for the SoC. The
44 * format is standardized across OMAPs for use by the OMAP watchdog. 45 * format is standardized across OMAPs for use by the OMAP watchdog.
45 */ 46 */
46int omap1_get_reset_sources(void) 47u32 omap1_get_reset_sources(void)
47{ 48{
48 int ret = 0; 49 u32 ret = 0;
49 u16 rs; 50 u16 rs;
50 51
51 rs = __raw_readw(ARM_SYSST); 52 rs = __raw_readw(OMAP1_IO_ADDRESS(ARM_SYSST));
52 53
53 if (rs & (1 << ARM_SYSST_POR_SHIFT)) 54 if (rs & (1 << ARM_SYSST_POR_SHIFT))
54 ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT; 55 ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT;