sh: remove old CMT driver
PATCH 1/1 sh: remove old CMT driver
From: Magnus Damm <[email protected]>
This patch removes the old CMT driver (CONFIG_SH_CMT/timer-cmt.c)
As replacement, select the sh_cmt driver with CONFIG_SH_TIMER_CMT and configure timer channel using platform data.
If multiple CMT channels are enabled using platform data, use the earlytimer parameter on the kernel command line to select channel. For instance, use "earlytimer=sh_cmt.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 <[email protected]>
---
arch/sh/Kconfig | 18 --- arch/sh/include/asm/timer.h | 2 arch/sh/kernel/timers/Makefile | 1 arch/sh/kernel/timers/timer-cmt.c | 188 ------------------------------------- arch/sh/kernel/timers/timer.c | 3 5 files changed, 6 insertions(+), 206 deletions(-)
arch/sh/Kconfig +5 -13
@@ -462,22 +462,14 @@ config SH_TMU help This enables the use of the TMU as the system timer. -config SH_CMT - bool "CMT timer support" - depends on SYS_SUPPORTS_CMT && CPU_SH2 - default y - help - This enables the use of the CMT as the system timer. - -# -# Support for the new-style CMT driver. This will replace SH_CMT -# once its other dependencies are merged. -# config SH_TIMER_CMT - bool "CMT clockevents driver" - depends on SYS_SUPPORTS_CMT && !SH_CMT + bool "CMT timer driver" + depends on SYS_SUPPORTS_CMT + default y select GENERIC_CLOCKEVENTS select GENERIC_TIME + help + This enables build of the CMT timer driver. config SH_MTU2 bool "MTU2 timer support"
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, cmt_timer, mtu2_timer; +extern struct sys_timer tmu_timer, mtu2_timer;extern struct sys_timer *sys_timer;#ifndef CONFIG_GENERIC_TIME
arch/sh/kernel/timers/Makefile +0 -1
@@ -6,6 +6,5 @@ obj-y := timer.o obj-$(CONFIG_SH_TMU) += timer-tmu.o obj-$(CONFIG_SH_MTU2) += timer-mtu2.o -obj-$(CONFIG_SH_CMT) += timer-cmt.o obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += timer-broadcast.o
arch/sh/kernel/timers/timer-cmt.c deleted +0 -188
188 lines not on this page · raw message
arch/sh/kernel/timers/timer.c +0 -3
@@ -20,9 +20,6 @@ static struct sys_timer *sys_timers[] =#ifdef CONFIG_SH_MTU2 &mtu2_timer, #endif -#ifdef CONFIG_SH_CMT - &cmt_timer, -#endif NULL, };