From 47744754b112a26f51cefbe0a38753529b0f7238 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 26 Aug 2008 10:45:32 +0200 Subject: AT91SAM clocksource: switch to new headers, implement reset_cpu Signed-off-by: Sascha Hauer --- arch/arm/mach-at91sam9/clocksource.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-at91sam9/clocksource.c b/arch/arm/mach-at91sam9/clocksource.c index dfd2ecda9d..86a51d584e 100644 --- a/arch/arm/mach-at91sam9/clocksource.c +++ b/arch/arm/mach-at91sam9/clocksource.c @@ -33,13 +33,11 @@ #include #include #include -#include -#include -#include +#include uint64_t at91sam9_clocksource_read(void) { - return at91_sys_read(AT91_PIT_PIIR); + return readl(AT91C_PITC_PIIR); } static struct clocksource cs = { @@ -54,10 +52,10 @@ static int clocksource_init (void) * Enable PITC Clock * The clock is already enabled for system controller in boot */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); + writel(1 << AT91C_ID_SYS, AT91C_PMC_PCER); /* Enable PITC */ - at91_sys_write(AT91_PIT_MR, 0xfffff | AT91_PIT_PITEN); + writel(0xfffff | AT91C_PITC_PITEN, AT91C_PITC_PIMR); cs.mult = clocksource_hz2mult(1000000 * 6, cs.shift); @@ -73,5 +71,7 @@ core_initcall(clocksource_init); */ void reset_cpu (ulong ignored) { + writel((0xa5 << 24) | AT91C_RSTC_PROCRST | AT91C_RSTC_PERRST, + AT91C_RSTC_RCR); } EXPORT_SYMBOL(reset_cpu); -- cgit v1.2.3