diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-11-20 11:18:30 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-06 10:45:37 +0900 |
| commit | 417528a2e35f46bc42721de5c4efd33a0eba019d (patch) | |
| tree | 622d88ef2f82910063e841fd70d8720465c4dcef /arch | |
| parent | 716067f28931d46b9f460acbeae1478a337e58ec (diff) | |
| download | linux-417528a2e35f46bc42721de5c4efd33a0eba019d.tar.gz linux-417528a2e35f46bc42721de5c4efd33a0eba019d.tar.bz2 linux-417528a2e35f46bc42721de5c4efd33a0eba019d.zip | |
sh: Configurable timer IRQ.
All of the various CPU subtypes currently hardcode TIMER_IRQ,
switch this to a config option in the few places we need this.
This allows further removal of hardcoded IRQ headers..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/Kconfig | 7 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7780.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/timers/timer-cmt.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/timers/timer-mtu2.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/timers/timer-tmu.c | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ba7a15016307..b95dbb8db661 100644 --- a/arch/sh/Kconfig +++ b/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/arch/sh/kernel/cpu/sh4/setup-sh7780.c b/arch/sh/kernel/cpu/sh4/setup-sh7780.c index 814ddb226531..4a2b9e01b91f 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7780.c +++ b/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/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c index 30687383d4b0..24b03996da51 100644 --- a/arch/sh/kernel/timers/timer-cmt.c +++ b/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/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c index 045b2aba13fa..92c98b5b11ea 100644 --- a/arch/sh/kernel/timers/timer-mtu2.c +++ b/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/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c index 24927015dc31..06a70db7386d 100644 --- a/arch/sh/kernel/timers/timer-tmu.c +++ b/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"); |