diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2007-02-13 17:13:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-17 16:05:40 +0100 |
| commit | 3668b45d46f777b0773ef5ff49531c1144efb6dd (patch) | |
| tree | d9bb1a1ce8d0cce8bff99578fc0ba4bf8cdedd75 /arch/arm/mach-iop13xx/iq81340mc.c | |
| parent | [ARM] 4186/1: iop: remove cp6_enable/disable routines (diff) | |
| download | linux-3668b45d46f777b0773ef5ff49531c1144efb6dd.tar.xz linux-3668b45d46f777b0773ef5ff49531c1144efb6dd.zip | |
[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/iq81340mc.c')
| -rw-r--r-- | arch/arm/mach-iop13xx/iq81340mc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c index 2a1bbfe9896f..a519d707571c 100644 --- a/arch/arm/mach-iop13xx/iq81340mc.c +++ b/arch/arm/mach-iop13xx/iq81340mc.c @@ -25,6 +25,7 @@ #include <asm/mach/arch.h> #include <asm/arch/pci.h> #include <asm/mach/time.h> +#include <asm/arch/time.h> extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */ @@ -78,12 +79,12 @@ static void __init iq81340mc_init(void) static void __init iq81340mc_timer_init(void) { - iop13xx_init_time(400000000); + iop_init_time(400000000); } static struct sys_timer iq81340mc_timer = { .init = iq81340mc_timer_init, - .offset = iop13xx_gettimeoffset, + .offset = iop_gettimeoffset, }; MACHINE_START(IQ81340MC, "Intel IQ81340MC") |