Gitweb: http://git.kernel.org/linus/d63f3a5857906851b9c1a39e3871a97f4acc1005
Commit: d63f3a5857906851b9c1a39e3871a97f4acc1005
Parent: f5ad881b425616741bf8696f70b2749abe54a936
Author: Paul Mundt <lethal@linux-sh.org>
AuthorDate: Thu Jan 29 18:10:13 2009 +0900
Committer: Paul Mundt <lethal@linux-sh.org>
CommitDate: Thu Jan 29 18:10:13 2009 +0900
sh: Fix up MTU2 support for SH7203.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
arch/sh/Kconfig | 3 ++-
arch/sh/kernel/timers/timer-mtu2.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5784bce..c6faad7 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -447,7 +447,8 @@ config SH_TIMER_IRQ
CPU_SUBTYPE_SH7763
default "86" if CPU_SUBTYPE_SH7619
default "140" if CPU_SUBTYPE_SH7206
- default "142" if CPU_SUBTYPE_SH7203
+ default "142" if CPU_SUBTYPE_SH7203 && SH_CMT
+ default "153" if CPU_SUBTYPE_SH7203 && SH_MTU2
default "238" if CPU_SUBTYPE_MXG
default "16"
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index c3d237e..9a77ae8 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -35,7 +35,8 @@
#define MTU2_TSR_1 0xfffe4385
#define MTU2_TCNT_1 0xfffe4386 /* 16-bit counter */
-#if defined(CONFIG_CPU_SUBTYPE_SH7201)
+#if defined(CONFIG_CPU_SUBTYPE_SH7201) || \
+ defined(CONFIG_CPU_SUBTYPE_SH7203)
#define MTU2_TGRA_1 0xfffe4388
#else
#define MTU2_TGRA_1 0xfffe438a
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
