summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop33x/iq80331.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2007-02-13 17:13:34 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-17 15:05:40 +0000
commit3668b45d46f777b0773ef5ff49531c1144efb6dd (patch)
treed9bb1a1ce8d0cce8bff99578fc0ba4bf8cdedd75 /arch/arm/mach-iop33x/iq80331.c
parent4434c5c7fd61c6713de882a2272b66f32fe7cac3 (diff)
downloadop-kernel-dev-3668b45d46f777b0773ef5ff49531c1144efb6dd.zip
op-kernel-dev-3668b45d46f777b0773ef5ff49531c1144efb6dd.tar.gz
[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-iop33x/iq80331.c')
-rw-r--r--arch/arm/mach-iop33x/iq80331.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c
index 97a7b74..1a9e361 100644
--- a/arch/arm/mach-iop33x/iq80331.c
+++ b/arch/arm/mach-iop33x/iq80331.c
@@ -32,6 +32,7 @@
#include <asm/mach-types.h>
#include <asm/page.h>
#include <asm/pgtable.h>
+#include <asm/arch/time.h>
/*
* IQ80331 timer tick configuration.
@@ -40,14 +41,14 @@ static void __init iq80331_timer_init(void)
{
/* D-Step parts run at a higher internal bus frequency */
if (*IOP3XX_ATURID >= 0xa)
- iop3xx_init_time(333000000);
+ iop_init_time(333000000);
else
- iop3xx_init_time(266000000);
+ iop_init_time(266000000);
}
static struct sys_timer iq80331_timer = {
.init = iq80331_timer_init,
- .offset = iop3xx_gettimeoffset,
+ .offset = iop_gettimeoffset,
};
OpenPOWER on IntegriCloud