aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-01-29 04:10:13 -0500
committerPaul Mundt <lethal@linux-sh.org>2009-01-29 04:10:13 -0500
commitd63f3a5857906851b9c1a39e3871a97f4acc1005 (patch)
tree7f00fbea355b5024f1e957e60899bf81348cf856 /arch/sh
parentf5ad881b425616741bf8696f70b2749abe54a936 (diff)
sh: Fix up MTU2 support for SH7203.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/kernel/timers/timer-mtu2.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5784bcec1a16..c6faad734e57 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -447,7 +447,8 @@ config SH_TIMER_IRQ
447 CPU_SUBTYPE_SH7763 447 CPU_SUBTYPE_SH7763
448 default "86" if CPU_SUBTYPE_SH7619 448 default "86" if CPU_SUBTYPE_SH7619
449 default "140" if CPU_SUBTYPE_SH7206 449 default "140" if CPU_SUBTYPE_SH7206
450 default "142" if CPU_SUBTYPE_SH7203 450 default "142" if CPU_SUBTYPE_SH7203 && SH_CMT
451 default "153" if CPU_SUBTYPE_SH7203 && SH_MTU2
451 default "238" if CPU_SUBTYPE_MXG 452 default "238" if CPU_SUBTYPE_MXG
452 default "16" 453 default "16"
453 454
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index c3d237e1d566..9a77ae86b403 100644
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -35,7 +35,8 @@
35#define MTU2_TSR_1 0xfffe4385 35#define MTU2_TSR_1 0xfffe4385
36#define MTU2_TCNT_1 0xfffe4386 /* 16-bit counter */ 36#define MTU2_TCNT_1 0xfffe4386 /* 16-bit counter */
37 37
38#if defined(CONFIG_CPU_SUBTYPE_SH7201) 38#if defined(CONFIG_CPU_SUBTYPE_SH7201) || \
39 defined(CONFIG_CPU_SUBTYPE_SH7203)
39#define MTU2_TGRA_1 0xfffe4388 40#define MTU2_TGRA_1 0xfffe4388
40#else 41#else
41#define MTU2_TGRA_1 0xfffe438a 42#define MTU2_TGRA_1 0xfffe438a