Skip to contentSkip to conversation

sh: remove old TMU driver

PATCH In review Magnus Damm 2 participants 6 messages May 12, 2009 – May 15, 2009 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: remove old TMU driver

From: Magnus Damm <[email protected]>

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.

---

 arch/sh/Kconfig                     |    9 -
 arch/sh/include/asm/timer.h         |    1 
 arch/sh/include/cpu-sh3/cpu/timer.h |   67 -------
 arch/sh/include/cpu-sh4/cpu/timer.h |   60 -------
 arch/sh/kernel/timers/Makefile      |    2 
 arch/sh/kernel/timers/timer-tmu.c   |  297 -----------------------------------
 arch/sh/kernel/timers/timer.c       |    3 
 7 files changed, 1 insertion(+), 438 deletions(-)
arch/sh/Kconfig +1 -8
@@ -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.
arch/sh/include/asm/timer.h +0 -1
@@ -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 */
arch/sh/include/cpu-sh3/cpu/timer.h deleted +0 -67

67 lines not on this page · raw message

arch/sh/include/cpu-sh4/cpu/timer.h deleted +0 -60

60 lines not on this page · raw message

arch/sh/kernel/timers/Makefile +0 -2
@@ -3,5 +3,3 @@
 #
 
 obj-y	:= timer.o
-
-obj-$(CONFIG_SH_TMU)		+= timer-tmu.o
arch/sh/kernel/timers/timer-tmu.c deleted +0 -294

294 lines not on this page · raw message

+++ work/arch/sh/kernel/timers/timer.c 2009-05-12 17:51:40.000000000 +0900
@@ -14,9 +14,6 @@
#include <asm/timer.h>

static struct sys_timer *sys_timers[] = {
-#ifdef CONFIG_SH_TMU
- &tmu_timer,
-#endif
NULL,
};

#1 lore raw
Quoted 11 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 5 lines

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

---

Is there a git where I can sync to have your patch set? I'd to test on the r2dplus (real hw and qemu)

Best Regards,
J.

#2 lore raw
In reply to Magnus Damm

Hi Jean-Christophe,

Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 7 lines
Quoted 5 lines

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

---

Is there a git where I can sync to have your patch set? I'd to test on the r2dplus (real hw and qemu)

Latest sh-2.6.git tree has all the timer stuff merged. I've actually already tested on r2d plus hardware a bit - one of my target platforms
- but more testing is always welcome. =)

Cheers,

/ magnus

#3 lore raw
In reply to Magnus Damm
Quoted 19 lines · Magnus Damm

Hi Jean-Christophe,

Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 14 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

---

Is there a git where I can sync to have your patch set? I'd to test on the r2dplus (real hw and qemu)

Latest sh-2.6.git tree has all the timer stuff merged. I've actually already tested on r2d plus hardware a bit - one of my target platforms
- but more testing is always welcome. =)

tks

I want to known the qemu comportment too.

Best Regards,
J.

#4 lore raw
In reply to Magnus Damm
Quoted 25 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 24 lines · Magnus Damm

Hi Jean-Christophe,

Quoted 19 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 5 lines

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

---

Is there a git where I can sync to have your patch set? I'd to test on the r2dplus (real hw and qemu)

Quoted 6 lines
Quoted 3 lines

Latest sh-2.6.git tree has all the timer stuff merged. I've actually already tested on r2d plus hardware a bit - one of my target platforms
- but more testing is always welcome. =)

tks

I want to known the qemu comportment too.

works fine on qemu r2dplus too

Best Regards,
J.

#5 lore raw
In reply to Magnus Damm
Quoted 8 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 4 lines
Quoted 4 lines · Magnus Damm
Quoted 3 lines

From: Magnus Damm <[email protected]>

This patch removes the old TMU driver (CONFIG_SH_TMU/timer-tmu.c)

I want to known the qemu comportment too.

works fine on qemu r2dplus too

Great, thanks for testing!

/ magnus