diff options
| author |   Paul Walmsley <paul@pwsan.com> | 2012-10-29 20:49:43 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-10-29 20:49:43 -0600 |
| commit | 508c0d47736023fdcb491fd55ad64f7e08f6f32f (patch) | |
| tree | e20ad3fd0673ac9a00900bb03f818cc01b9464a0 /arch/arm/mach-omap1/reset.c | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (diff) | |
| download | linux-dev-508c0d47736023fdcb491fd55ad64f7e08f6f32f.tar.xz linux-dev-508c0d47736023fdcb491fd55ad64f7e08f6f32f.zip | |
ARM: OMAP1: CGRM: fix omap1_get_reset_sources() return type
An older version of the patch "ARM: OMAP1: create read_reset_sources()
function (for initial use by watchdog)" was sent upstream, which used
the wrong return type for the omap1_get_reset_sources() function.
Fix it to return a u32, which is what the WDTIMER platform_data
function pointer read_reset_sources() expects.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap1/reset.c')
| -rw-r--r-- | arch/arm/mach-omap1/reset.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ #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; |