diff options
| author | Philippe Gerum <rpm@xenomai.org> | 2009-06-16 05:25:42 +0200 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-22 21:15:54 -0400 |
| commit | a40494a62a11dbaf326397aa94b2018ead09884d (patch) | |
| tree | 2440b4b4b510393ff057761021e9b218a5e1e142 /arch/blackfin/include/asm/ipipe.h | |
| parent | 06ecc190f3928850cb77c498f745fc8e9a7e2fd7 (diff) | |
Blackfin: allow CONFIG_TICKSOURCE_GPTMR0 with interrupt pipeline
Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include/asm/ipipe.h')
| -rw-r--r-- | arch/blackfin/include/asm/ipipe.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h index bbe1c3726b6..ffa5e60faa9 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h @@ -207,7 +207,7 @@ void ipipe_init_irq_threads(void); int ipipe_start_irq_thread(unsigned irq, struct irq_desc *desc); -#ifdef CONFIG_GENERIC_CLOCKEVENTS +#ifdef CONFIG_TICKSOURCE_CORETMR #define IRQ_SYSTMR IRQ_CORETMR #define IRQ_PRIOTMR IRQ_CORETMR #else @@ -240,8 +240,13 @@ int ipipe_start_irq_thread(unsigned irq, struct irq_desc *desc); #define ipipe_init_irq_threads() do { } while (0) #define ipipe_start_irq_thread(irq, desc) 0 +#ifndef CONFIG_TICKSOURCE_GPTMR0 #define IRQ_SYSTMR IRQ_CORETMR #define IRQ_PRIOTMR IRQ_CORETMR +#else +#define IRQ_SYSTMR IRQ_TIMER0 +#define IRQ_PRIOTMR CONFIG_IRQ_TIMER0 +#endif #define __ipipe_root_tick_p(regs) 1 |