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-iop13xx/iq81340sc.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-iop13xx/iq81340sc.c')
-rw-r--r-- | arch/arm/mach-iop13xx/iq81340sc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c index 5ad2b62c9bfd..0e71fbcabe00 100644 --- a/arch/arm/mach-iop13xx/iq81340sc.c +++ b/arch/arm/mach-iop13xx/iq81340sc.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
26 | #include <asm/arch/pci.h> | 26 | #include <asm/arch/pci.h> |
27 | #include <asm/mach/time.h> | 27 | #include <asm/mach/time.h> |
28 | #include <asm/arch/time.h> | ||
28 | 29 | ||
29 | extern int init_atu; | 30 | extern int init_atu; |
30 | 31 | ||
@@ -80,12 +81,12 @@ static void __init iq81340sc_init(void) | |||
80 | 81 | ||
81 | static void __init iq81340sc_timer_init(void) | 82 | static void __init iq81340sc_timer_init(void) |
82 | { | 83 | { |
83 | iop13xx_init_time(400000000); | 84 | iop_init_time(400000000); |
84 | } | 85 | } |
85 | 86 | ||
86 | static struct sys_timer iq81340sc_timer = { | 87 | static struct sys_timer iq81340sc_timer = { |
87 | .init = iq81340sc_timer_init, | 88 | .init = iq81340sc_timer_init, |
88 | .offset = iop13xx_gettimeoffset, | 89 | .offset = iop_gettimeoffset, |
89 | }; | 90 | }; |
90 | 91 | ||
91 | MACHINE_START(IQ81340SC, "Intel IQ81340SC") | 92 | MACHINE_START(IQ81340SC, "Intel IQ81340SC") |