---

yaml --- r: 42581 b: refs/heads/master c: 417528a h: refs/heads/master i: 42579: aa52f9b v: v3
git-mirror · Dec 6, 2006 · af62670 · af62670
1 parent 2d29f09
commit af62670
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 716067f28931d46b9f460acbeae1478a337e58ec
+refs/heads/master: 417528a2e35f46bc42721de5c4efd33a0eba019d
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -405,6 +405,13 @@ source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 
 source "arch/sh/boards/renesas/r7780rp/Kconfig"
 
+config SH_TIMER_IRQ
+	int
+	default "28" if CPU_SUBTYPE_SH7780
+	default "86" if CPU_SUBTYPE_SH7619
+	default "140" if CPU_SUBTYPE_SH7206
+	default "16"
+
 config SH_PCLK_FREQ
 	int "Peripheral clock frequency (in Hz)"
 	default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343

diff --git a/trunk/arch/sh/kernel/cpu/sh4/setup-sh7780.c b/trunk/arch/sh/kernel/cpu/sh4/setup-sh7780.c
@@ -79,7 +79,7 @@ static int __init sh7780_devices_setup(void)
 __initcall(sh7780_devices_setup);
 
 static struct intc2_data intc2_irq_table[] = {
-	{ TIMER_IRQ, 0, 24, 0, INTC_TMU0_MSK, 2 },
+	{ 28, 0, 24, 0, INTC_TMU0_MSK, 2 },
 	{ 21, 1, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
 	{ 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY },
 	{ 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY },

diff --git a/trunk/arch/sh/kernel/timers/timer-cmt.c b/trunk/arch/sh/kernel/timers/timer-cmt.c
@@ -169,7 +169,7 @@ static int cmt_timer_init(void)
 
 	cmt_clock_enable();
 
-	setup_irq(TIMER_IRQ, &cmt_irq);
+	setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq);
 
 	cmt0_clk.parent = clk_get("module_clk");
 

diff --git a/trunk/arch/sh/kernel/timers/timer-mtu2.c b/trunk/arch/sh/kernel/timers/timer-mtu2.c
@@ -167,7 +167,7 @@ static int mtu2_timer_init(void)
 	u8 tmp;
 	unsigned long interval;
 
-	setup_irq(TIMER_IRQ, &mtu2_irq);
+	setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);
 
 	mtu2_clk1.parent = clk_get("module_clk");
 

diff --git a/trunk/arch/sh/kernel/timers/timer-tmu.c b/trunk/arch/sh/kernel/timers/timer-tmu.c
@@ -149,7 +149,7 @@ static int tmu_timer_init(void)
 {
 	unsigned long interval;
 
-	setup_irq(TIMER_IRQ, &tmu_irq);
+	setup_irq(CONFIG_SH_TIMER_IRQ, &tmu_irq);
 
 	tmu0_clk.parent = clk_get("module_clk");