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-iop33x | |
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-iop33x')
-rw-r--r-- | arch/arm/mach-iop33x/iq80331.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/iq80332.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c index 97a7b7488264..1a9e36138d80 100644 --- a/arch/arm/mach-iop33x/iq80331.c +++ b/arch/arm/mach-iop33x/iq80331.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | #include <asm/page.h> | 33 | #include <asm/page.h> |
34 | #include <asm/pgtable.h> | 34 | #include <asm/pgtable.h> |
35 | #include <asm/arch/time.h> | ||
35 | 36 | ||
36 | /* | 37 | /* |
37 | * IQ80331 timer tick configuration. | 38 | * IQ80331 timer tick configuration. |
@@ -40,14 +41,14 @@ static void __init iq80331_timer_init(void) | |||
40 | { | 41 | { |
41 | /* D-Step parts run at a higher internal bus frequency */ | 42 | /* D-Step parts run at a higher internal bus frequency */ |
42 | if (*IOP3XX_ATURID >= 0xa) | 43 | if (*IOP3XX_ATURID >= 0xa) |
43 | iop3xx_init_time(333000000); | 44 | iop_init_time(333000000); |
44 | else | 45 | else |
45 | iop3xx_init_time(266000000); | 46 | iop_init_time(266000000); |
46 | } | 47 | } |
47 | 48 | ||
48 | static struct sys_timer iq80331_timer = { | 49 | static struct sys_timer iq80331_timer = { |
49 | .init = iq80331_timer_init, | 50 | .init = iq80331_timer_init, |
50 | .offset = iop3xx_gettimeoffset, | 51 | .offset = iop_gettimeoffset, |
51 | }; | 52 | }; |
52 | 53 | ||
53 | 54 | ||
diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c index 9887bfc1c078..96d6f0f3cd21 100644 --- a/arch/arm/mach-iop33x/iq80332.c +++ b/arch/arm/mach-iop33x/iq80332.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | #include <asm/page.h> | 33 | #include <asm/page.h> |
34 | #include <asm/pgtable.h> | 34 | #include <asm/pgtable.h> |
35 | #include <asm/arch/time.h> | ||
35 | 36 | ||
36 | /* | 37 | /* |
37 | * IQ80332 timer tick configuration. | 38 | * IQ80332 timer tick configuration. |
@@ -40,14 +41,14 @@ static void __init iq80332_timer_init(void) | |||
40 | { | 41 | { |
41 | /* D-Step parts and the iop333 run at a higher internal bus frequency */ | 42 | /* D-Step parts and the iop333 run at a higher internal bus frequency */ |
42 | if (*IOP3XX_ATURID >= 0xa || *IOP3XX_ATUDID == 0x374) | 43 | if (*IOP3XX_ATURID >= 0xa || *IOP3XX_ATUDID == 0x374) |
43 | iop3xx_init_time(333000000); | 44 | iop_init_time(333000000); |
44 | else | 45 | else |
45 | iop3xx_init_time(266000000); | 46 | iop_init_time(266000000); |
46 | } | 47 | } |
47 | 48 | ||
48 | static struct sys_timer iq80332_timer = { | 49 | static struct sys_timer iq80332_timer = { |
49 | .init = iq80332_timer_init, | 50 | .init = iq80332_timer_init, |
50 | .offset = iop3xx_gettimeoffset, | 51 | .offset = iop_gettimeoffset, |
51 | }; | 52 | }; |
52 | 53 | ||
53 | 54 | ||