diff options
author | Dan Williams <dan.j.williams@intel.com> | 2007-02-13 11:13:34 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-17 10:05:40 -0500 |
commit | 3668b45d46f777b0773ef5ff49531c1144efb6dd (patch) | |
tree | d9bb1a1ce8d0cce8bff99578fc0ba4bf8cdedd75 /arch/arm/mach-iop32x/n2100.c | |
parent | 4434c5c7fd61c6713de882a2272b66f32fe7cac3 (diff) |
[ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx
* architecture specific details are handled in asm/arch/time.h
* ARCH_IOP13XX now selects PLAT_IOP
* as suggested by Lennert use ifdef CONFIG_XSCALE to skip the cp_wait on
XSC3
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop32x/n2100.c')
-rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 2499a7707e3c..92fa0c55443e 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
38 | #include <asm/page.h> | 38 | #include <asm/page.h> |
39 | #include <asm/pgtable.h> | 39 | #include <asm/pgtable.h> |
40 | #include <asm/arch/time.h> | ||
40 | 41 | ||
41 | /* | 42 | /* |
42 | * N2100 timer tick configuration. | 43 | * N2100 timer tick configuration. |
@@ -44,12 +45,12 @@ | |||
44 | static void __init n2100_timer_init(void) | 45 | static void __init n2100_timer_init(void) |
45 | { | 46 | { |
46 | /* 33.000 MHz crystal. */ | 47 | /* 33.000 MHz crystal. */ |
47 | iop3xx_init_time(198000000); | 48 | iop_init_time(198000000); |
48 | } | 49 | } |
49 | 50 | ||
50 | static struct sys_timer n2100_timer = { | 51 | static struct sys_timer n2100_timer = { |
51 | .init = n2100_timer_init, | 52 | .init = n2100_timer_init, |
52 | .offset = iop3xx_gettimeoffset, | 53 | .offset = iop_gettimeoffset, |
53 | }; | 54 | }; |
54 | 55 | ||
55 | 56 | ||