Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sh: Configurable timer IRQ.

Browse Source 
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>
This commit is contained in:
Paul Mundt 2006-11-20 11:18:30 +09:00
parent 716067f289
commit 417528a2e3
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/sh/Kconfig
View File

@ -405,6 +405,13 @@ source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
source "arch/sh/boards/renesas/r7780rp/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 config SH_PCLK_FREQ
int "Peripheral clock frequency (in Hz)" int "Peripheral clock frequency (in Hz)"
default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343 default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343

2
arch/sh/kernel/cpu/sh4/setup-sh7780.c
View File

@ -79,7 +79,7 @@ static int __init sh7780_devices_setup(void)
__initcall(sh7780_devices_setup); __initcall(sh7780_devices_setup);
static struct intc2_data intc2_irq_table[] = { 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 }, { 21, 1, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
{ 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY }, { 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY },
{ 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY }, { 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY },

2
arch/sh/kernel/timers/timer-cmt.c
View File

@ -169,7 +169,7 @@ static int cmt_timer_init(void)
cmt_clock_enable(); cmt_clock_enable();
setup_irq(TIMER_IRQ, &cmt_irq); setup_irq(CONFIG_SH_TIMER_IRQ, &cmt_irq);
cmt0_clk.parent = clk_get("module_clk"); cmt0_clk.parent = clk_get("module_clk");

2
arch/sh/kernel/timers/timer-mtu2.c
View File

@ -167,7 +167,7 @@ static int mtu2_timer_init(void)
u8 tmp; u8 tmp;
unsigned long interval; unsigned long interval;
setup_irq(TIMER_IRQ, &mtu2_irq); setup_irq(CONFIG_SH_TIMER_IRQ, &mtu2_irq);
mtu2_clk1.parent = clk_get("module_clk"); mtu2_clk1.parent = clk_get("module_clk");

2
arch/sh/kernel/timers/timer-tmu.c
View File

@ -149,7 +149,7 @@ static int tmu_timer_init(void)
{ {
unsigned long interval; unsigned long interval;
setup_irq(TIMER_IRQ, &tmu_irq); setup_irq(CONFIG_SH_TIMER_IRQ, &tmu_irq);
tmu0_clk.parent = clk_get("module_clk"); tmu0_clk.parent = clk_get("module_clk");