diff options
Diffstat (limited to 'include/asm-sh/irq.h')
-rw-r--r-- | include/asm-sh/irq.h | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h index 28996f9c58cc..6cd3e9e2a76a 100644 --- a/include/asm-sh/irq.h +++ b/include/asm-sh/irq.h | |||
@@ -14,16 +14,6 @@ | |||
14 | #include <asm/machvec.h> | 14 | #include <asm/machvec.h> |
15 | #include <asm/ptrace.h> /* for pt_regs */ | 15 | #include <asm/ptrace.h> /* for pt_regs */ |
16 | 16 | ||
17 | #if defined(CONFIG_SH_HP6XX) || \ | ||
18 | defined(CONFIG_SH_RTS7751R2D) || \ | ||
19 | defined(CONFIG_SH_HS7751RVOIP) || \ | ||
20 | defined(CONFIG_SH_HS7751RVOIP) || \ | ||
21 | defined(CONFIG_SH_SH03) || \ | ||
22 | defined(CONFIG_SH_R7780RP) || \ | ||
23 | defined(CONFIG_SH_LANDISK) | ||
24 | #include <asm/mach/ide.h> | ||
25 | #endif | ||
26 | |||
27 | #ifndef CONFIG_CPU_SUBTYPE_SH7780 | 17 | #ifndef CONFIG_CPU_SUBTYPE_SH7780 |
28 | 18 | ||
29 | #define INTC_DMAC0_MSK 0 | 19 | #define INTC_DMAC0_MSK 0 |
@@ -38,15 +28,6 @@ | |||
38 | #define INTC_IPRD 0xffd00010UL | 28 | #define INTC_IPRD 0xffd00010UL |
39 | #endif | 29 | #endif |
40 | 30 | ||
41 | #ifdef CONFIG_IDE | ||
42 | # ifndef IRQ_CFCARD | ||
43 | # define IRQ_CFCARD 14 | ||
44 | # endif | ||
45 | # ifndef IRQ_PCMCIA | ||
46 | # define IRQ_PCMCIA 15 | ||
47 | # endif | ||
48 | #endif | ||
49 | |||
50 | #define TIMER_IRQ 16 | 31 | #define TIMER_IRQ 16 |
51 | #define TIMER_IPR_ADDR INTC_IPRA | 32 | #define TIMER_IPR_ADDR INTC_IPRA |
52 | #define TIMER_IPR_POS 3 | 33 | #define TIMER_IPR_POS 3 |
@@ -346,11 +327,17 @@ extern unsigned short *irq_mask_register; | |||
346 | */ | 327 | */ |
347 | void init_IRQ_pint(void); | 328 | void init_IRQ_pint(void); |
348 | 329 | ||
330 | struct ipr_data { | ||
331 | unsigned int irq; | ||
332 | unsigned int addr; /* Address of Interrupt Priority Register */ | ||
333 | int shift; /* Shifts of the 16-bit data */ | ||
334 | int priority; /* The priority */ | ||
335 | }; | ||
336 | |||
349 | /* | 337 | /* |
350 | * Function for "on chip support modules". | 338 | * Function for "on chip support modules". |
351 | */ | 339 | */ |
352 | extern void make_ipr_irq(unsigned int irq, unsigned int addr, | 340 | extern void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs); |
353 | int pos, int priority); | ||
354 | extern void make_imask_irq(unsigned int irq); | 341 | extern void make_imask_irq(unsigned int irq); |
355 | 342 | ||
356 | #if defined(CONFIG_CPU_SUBTYPE_SH7300) | 343 | #if defined(CONFIG_CPU_SUBTYPE_SH7300) |
@@ -704,7 +691,7 @@ struct intc2_data { | |||
704 | unsigned char priority; | 691 | unsigned char priority; |
705 | }; | 692 | }; |
706 | 693 | ||
707 | void make_intc2_irq(struct intc2_data *); | 694 | void make_intc2_irq(struct intc2_data *, unsigned int nr_irqs); |
708 | void init_IRQ_intc2(void); | 695 | void init_IRQ_intc2(void); |
709 | #endif | 696 | #endif |
710 | 697 | ||