Skip to content

Commit

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

As replacement, select the sh_tmu driver with CONFIG_SH_TIMER_TMU
and configure timer channel using platform data.

If multiple TMU channels are enabled using platform data, use the
earlytimer parameter on the kernel command line to select channel.
For instance, use "earlytimer=sh_tmu.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 12, 2009
1 parent 2b23a88 commit f19900b
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 438 deletions.
9 changes: 1 addition & 8 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -473,16 +473,9 @@ source "arch/sh/boards/Kconfig"

menu "Timer and clock configuration"

config SH_TMU
bool "TMU timer support"
depends on CPU_SH3 || CPU_SH4
default y
help
This enables the use of the TMU as the system timer.

config SH_TIMER_TMU
bool "TMU timer driver"
depends on !SH_TMU && SYS_SUPPORTS_TMU
depends on SYS_SUPPORTS_TMU
default y
help
This enables the build of the TMU timer driver.
Expand Down
1 change: 0 additions & 1 deletion arch/sh/include/asm/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ struct sys_timer {
struct sys_timer_ops *ops;
};

extern struct sys_timer tmu_timer;
extern struct sys_timer *sys_timer;

/* arch/sh/kernel/timers/timer.c */
Expand Down
67 changes: 0 additions & 67 deletions arch/sh/include/cpu-sh3/cpu/timer.h

This file was deleted.

60 changes: 0 additions & 60 deletions arch/sh/include/cpu-sh4/cpu/timer.h

This file was deleted.

2 changes: 0 additions & 2 deletions arch/sh/kernel/timers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
#

obj-y := timer.o

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

0 comments on commit f19900b

Please sign in to comment.