Skip to contentSkip to conversation

sh: remove old MTU2 driver

PATCH New Magnus Damm 1 participant 1 message Apr 30, 2009 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: remove old MTU2 driver

From: Magnus Damm <[email protected]>

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.

---

 arch/sh/Kconfig                    |    9 -
 arch/sh/include/asm/timer.h        |    2 
 arch/sh/kernel/timers/Makefile     |    1 
 arch/sh/kernel/timers/timer-mtu2.c |  202 ------------------------------------
 arch/sh/kernel/timers/timer.c      |    3 
 5 files changed, 2 insertions(+), 215 deletions(-)
arch/sh/Kconfig +1 -8
@@ -478,16 +478,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
arch/sh/include/asm/timer.h +1 -1
@@ -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;
 
 #ifndef CONFIG_GENERIC_TIME
arch/sh/kernel/timers/Makefile +0 -1
@@ -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
arch/sh/kernel/timers/timer-mtu2.c deleted +0 -202

202 lines not on this page · raw message

arch/sh/kernel/timers/timer.c +0 -3
@@ -17,9 +17,6 @@ static struct sys_timer *sys_timers[] = 
 #ifdef CONFIG_SH_TMU
 	&tmu_timer,
 #endif
-#ifdef CONFIG_SH_MTU2
-	&mtu2_timer,
-#endif
 	NULL,
 };