diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-22 21:59:55 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-29 15:35:32 -0400 |
commit | 310a09d8508b8e048c7efdf53bb91f2cd787b58e (patch) | |
tree | 80e86e2e9abb4d37e43514cf070c93fba3a8918c /arch/mips/au1000/common/time.c | |
parent | be5f1f2114665508a722e3924a3a7f477c502841 (diff) |
[MIPS] Alchemy: Nuke homebrew setup_irq(), it's broken and unnecessary.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000/common/time.c')
-rw-r--r-- | arch/mips/au1000/common/time.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index 2556399708ba..c8116bcacf55 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
@@ -67,7 +67,7 @@ static DEFINE_SPINLOCK(time_lock); | |||
67 | unsigned long wtimer; | 67 | unsigned long wtimer; |
68 | 68 | ||
69 | #ifdef CONFIG_PM | 69 | #ifdef CONFIG_PM |
70 | irqreturn_t counter0_irq(int irq, void *dev_id) | 70 | static irqreturn_t counter0_irq(int irq, void *dev_id) |
71 | { | 71 | { |
72 | unsigned long pc0; | 72 | unsigned long pc0; |
73 | int time_elapsed; | 73 | int time_elapsed; |
@@ -117,6 +117,13 @@ irqreturn_t counter0_irq(int irq, void *dev_id) | |||
117 | return IRQ_HANDLED; | 117 | return IRQ_HANDLED; |
118 | } | 118 | } |
119 | 119 | ||
120 | struct irqaction counter0_action = { | ||
121 | .handler = counter0_irq, | ||
122 | .flags = IRQF_DISABLED, | ||
123 | .name = "alchemy-toy", | ||
124 | .dev_id = NULL, | ||
125 | }; | ||
126 | |||
120 | /* When we wakeup from sleep, we have to "catch up" on all of the | 127 | /* When we wakeup from sleep, we have to "catch up" on all of the |
121 | * timer ticks we have missed. | 128 | * timer ticks we have missed. |
122 | */ | 129 | */ |
@@ -280,7 +287,7 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
280 | au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2); | 287 | au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2); |
281 | au_sync(); | 288 | au_sync(); |
282 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); | 289 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); |
283 | startup_match20_interrupt(counter0_irq); | 290 | setup_irq(AU1000_TOY_MATCH2_INT, &counter0_action); |
284 | 291 | ||
285 | /* We can use the real 'wait' instruction. | 292 | /* We can use the real 'wait' instruction. |
286 | */ | 293 | */ |