Skip to content

Commit

Permalink
sh: remove old MTU2 driver
Browse files Browse the repository at this point in the history
This patch removes the old MTU2 driver (CONFIG_SH_MTU2/timer-mtu2.c)

As replacement, select the sh_cmt driver with CONFIG_SH_TIMER_MTU2
and configure timer channel using platform data.

If multiple MTU channels are enabled using platform data, use the
earlytimer parameter on the kernel command line to select channel.
For instance, use "earlytimer=sh_mtu2.0" to select the first channel.

To verify which timer is being used, look at printouts or the timer
irq count in /proc/interrupts.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed May 3, 2009
1 parent da107c6 commit 3280c88
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 215 deletions.
9 changes: 1 addition & 8 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -479,16 +479,9 @@ config SH_TIMER_CMT
help
This enables build of the CMT timer driver.

config SH_MTU2
bool "MTU2 timer support"
depends on CPU_SH2A && !GENERIC_TIME
default y
help
This enables the use of the MTU2 as the system timer.

config SH_TIMER_MTU2
bool "MTU2 timer driver"
depends on SYS_SUPPORTS_MTU2 && !SH_MTU2
depends on SYS_SUPPORTS_MTU2
default y
select GENERIC_CLOCKEVENTS
help
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/include/asm/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct sys_timer {

#define TICK_SIZE (tick_nsec / 1000)

extern struct sys_timer tmu_timer, mtu2_timer;
extern struct sys_timer tmu_timer;
extern struct sys_timer *sys_timer;

#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
Expand Down
1 change: 0 additions & 1 deletion arch/sh/kernel/timers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
obj-y := timer.o

obj-$(CONFIG_SH_TMU) += timer-tmu.o
obj-$(CONFIG_SH_MTU2) += timer-mtu2.o

obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += timer-broadcast.o
202 changes: 0 additions & 202 deletions arch/sh/kernel/timers/timer-mtu2.c

This file was deleted.

3 changes: 0 additions & 3 deletions arch/sh/kernel/timers/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
static struct sys_timer *sys_timers[] = {
#ifdef CONFIG_SH_TMU
&tmu_timer,
#endif
#ifdef CONFIG_SH_MTU2
&mtu2_timer,
#endif
NULL,
};
Expand Down

0 comments on commit 3280c88

Please sign in to comment.