diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-22 12:59:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 22:34:54 +0200 |
| commit | 070bd46c9d9749b95b7629d1091abc1ac2672a51 (patch) | |
| tree | 50c817fb4e57709bdd5d602d81ced3912b478148 /arch/arm/mach-imx/clocksource.c | |
| parent | f9b94c867baebd7056a6fee3026c0d944c663f4c (diff) | |
| download | barebox-070bd46c9d9749b95b7629d1091abc1ac2672a51.tar.gz barebox-070bd46c9d9749b95b7629d1091abc1ac2672a51.tar.xz | |
ARM i.MX clocksource: put registers in iomem space
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/clocksource.c')
| -rw-r--r-- | arch/arm/mach-imx/clocksource.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 4f5895c2a5..4e77ece7f3 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -38,7 +38,7 @@ #include <io.h> #define GPT(x) __REG(IMX_TIM1_BASE + (x)) -#define timer_base (IMX_TIM1_BASE) +#define timer_base IOMEM(IMX_TIM1_BASE) static uint64_t imx_clocksource_read(void) { @@ -120,15 +120,17 @@ core_initcall(clocksource_init); */ void __noreturn reset_cpu (unsigned long addr) { + void __iomem *wdt = IOMEM(IMX_WDT_BASE); + /* Disable watchdog and set Time-Out field to 0 */ - writew(0x0, IMX_WDT_BASE + WDOG_WCR); + writew(0x0, wdt + WDOG_WCR); /* Write Service Sequence */ - writew(0x5555, IMX_WDT_BASE + WDOG_WSR); - writew(0xaaaa, IMX_WDT_BASE + WDOG_WSR); + writew(0x5555, wdt + WDOG_WSR); + writew(0xaaaa, wdt + WDOG_WSR); /* Enable watchdog */ - writew(WDOG_WCR_WDE, IMX_WDT_BASE + WDOG_WCR); + writew(WDOG_WCR_WDE, wdt + WDOG_WCR); while (1); /*NOTREACHED*/ |