ARM: OMAP1: CGRM: fix omap1_get_reset_sources() return type

[linux-2.6-block.git] / arch / arm / mach-omap1 / reset.c

diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c
index a0a9f97772ea7757c7293569e18b525a255358e6..cf8da1cd9b04019865ecb3bfaeab9acf248816b7 100644 (file)
--- a/arch/arm/mach-omap1/reset.c
+++ b/arch/arm/mach-omap1/reset.c
@@ -8,6 +8,7 @@
 
 #include <mach/hardware.h>
 
+#include "iomap.h"
 #include "common.h"
 
 /* ARM_SYSST bit shifts related to SoC reset sources */
@@ -43,12 +44,12 @@ void omap1_restart(char mode, const char *cmd)
  * Returns bits that represent the last reset source for the SoC.  The
  * format is standardized across OMAPs for use by the OMAP watchdog.
  */
-int omap1_get_reset_sources(void)
+u32 omap1_get_reset_sources(void)
 {
-       int ret = 0;
+       u32 ret = 0;
        u16 rs;
 
-       rs = __raw_readw(ARM_SYSST);
+       rs = __raw_readw(OMAP1_IO_ADDRESS(ARM_SYSST));
 
        if (rs & (1 << ARM_SYSST_POR_SHIFT))
                ret |= 1 << OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT;