diff options
author | Mikael Pettersson <mikpe@it.uu.se> | 2009-10-29 14:46:55 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-10-29 14:46:55 -0400 |
commit | 980f2296b5a8dfe589f023fd34229dcfdcf280fa (patch) | |
tree | 033746bf0eb178c0c86ddb365a0d93645c3e930f /arch/arm/mach-iop13xx | |
parent | 469d30448dad13600cdd246024f9db8e80614c45 (diff) |
iop: enable generic time
This updates the IOP platform to use the kernel's generic time
framework. With clockevent support in place, this reduces to
selecting GENERIC_TIME and removing the platform's private timer
->offset() operation (iop_gettimeoffset).
Tested on n2100, compile-tested for all plat-iop machines.
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/time.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/iq81340mc.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/iq81340sc.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/time.h b/arch/arm/mach-iop13xx/include/mach/time.h index b2fb17b35423..f1c00d6d560b 100644 --- a/arch/arm/mach-iop13xx/include/mach/time.h +++ b/arch/arm/mach-iop13xx/include/mach/time.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #define IOP13XX_CORE_FREQ_1200 (5 << 16) | 20 | #define IOP13XX_CORE_FREQ_1200 (5 << 16) |
21 | 21 | ||
22 | void iop_init_time(unsigned long tickrate); | 22 | void iop_init_time(unsigned long tickrate); |
23 | unsigned long iop_gettimeoffset(void); | ||
24 | 23 | ||
25 | static inline unsigned long iop13xx_core_freq(void) | 24 | static inline unsigned long iop13xx_core_freq(void) |
26 | { | 25 | { |
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c index 5051c03d437c..f91f3154577d 100644 --- a/arch/arm/mach-iop13xx/iq81340mc.c +++ b/arch/arm/mach-iop13xx/iq81340mc.c | |||
@@ -87,7 +87,6 @@ static void __init iq81340mc_timer_init(void) | |||
87 | 87 | ||
88 | static struct sys_timer iq81340mc_timer = { | 88 | static struct sys_timer iq81340mc_timer = { |
89 | .init = iq81340mc_timer_init, | 89 | .init = iq81340mc_timer_init, |
90 | .offset = iop_gettimeoffset, | ||
91 | }; | 90 | }; |
92 | 91 | ||
93 | MACHINE_START(IQ81340MC, "Intel IQ81340MC") | 92 | MACHINE_START(IQ81340MC, "Intel IQ81340MC") |
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c index bc443073a8e3..ddb7a3435de9 100644 --- a/arch/arm/mach-iop13xx/iq81340sc.c +++ b/arch/arm/mach-iop13xx/iq81340sc.c | |||
@@ -89,7 +89,6 @@ static void __init iq81340sc_timer_init(void) | |||
89 | 89 | ||
90 | static struct sys_timer iq81340sc_timer = { | 90 | static struct sys_timer iq81340sc_timer = { |
91 | .init = iq81340sc_timer_init, | 91 | .init = iq81340sc_timer_init, |
92 | .offset = iop_gettimeoffset, | ||
93 | }; | 92 | }; |
94 | 93 | ||
95 | MACHINE_START(IQ81340SC, "Intel IQ81340SC") | 94 | MACHINE_START(IQ81340SC, "Intel IQ81340SC") |