sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM i.MX clocksource: put registers in iomem space 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-06-22 12:59:40 +02:00
parent f9b94c867b
commit 070bd46c9d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-imx/clocksource.c
View File

@ -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*/