diff options
Diffstat (limited to 'arch/arm/mach-rpc/irq.c')
-rw-r--r-- | arch/arm/mach-rpc/irq.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c index 9dd15d679c5d..d29cd9b737fc 100644 --- a/arch/arm/mach-rpc/irq.c +++ b/arch/arm/mach-rpc/irq.c | |||
@@ -6,110 +6,110 @@ | |||
6 | #include <asm/hardware/iomd.h> | 6 | #include <asm/hardware/iomd.h> |
7 | #include <asm/irq.h> | 7 | #include <asm/irq.h> |
8 | 8 | ||
9 | static void iomd_ack_irq_a(unsigned int irq) | 9 | static void iomd_ack_irq_a(struct irq_data *d) |
10 | { | 10 | { |
11 | unsigned int val, mask; | 11 | unsigned int val, mask; |
12 | 12 | ||
13 | mask = 1 << irq; | 13 | mask = 1 << d->irq; |
14 | val = iomd_readb(IOMD_IRQMASKA); | 14 | val = iomd_readb(IOMD_IRQMASKA); |
15 | iomd_writeb(val & ~mask, IOMD_IRQMASKA); | 15 | iomd_writeb(val & ~mask, IOMD_IRQMASKA); |
16 | iomd_writeb(mask, IOMD_IRQCLRA); | 16 | iomd_writeb(mask, IOMD_IRQCLRA); |
17 | } | 17 | } |
18 | 18 | ||
19 | static void iomd_mask_irq_a(unsigned int irq) | 19 | static void iomd_mask_irq_a(struct irq_data *d) |
20 | { | 20 | { |
21 | unsigned int val, mask; | 21 | unsigned int val, mask; |
22 | 22 | ||
23 | mask = 1 << irq; | 23 | mask = 1 << d->irq; |
24 | val = iomd_readb(IOMD_IRQMASKA); | 24 | val = iomd_readb(IOMD_IRQMASKA); |
25 | iomd_writeb(val & ~mask, IOMD_IRQMASKA); | 25 | iomd_writeb(val & ~mask, IOMD_IRQMASKA); |
26 | } | 26 | } |
27 | 27 | ||
28 | static void iomd_unmask_irq_a(unsigned int irq) | 28 | static void iomd_unmask_irq_a(struct irq_data *d) |
29 | { | 29 | { |
30 | unsigned int val, mask; | 30 | unsigned int val, mask; |
31 | 31 | ||
32 | mask = 1 << irq; | 32 | mask = 1 << d->irq; |
33 | val = iomd_readb(IOMD_IRQMASKA); | 33 | val = iomd_readb(IOMD_IRQMASKA); |
34 | iomd_writeb(val | mask, IOMD_IRQMASKA); | 34 | iomd_writeb(val | mask, IOMD_IRQMASKA); |
35 | } | 35 | } |
36 | 36 | ||
37 | static struct irq_chip iomd_a_chip = { | 37 | static struct irq_chip iomd_a_chip = { |
38 | .ack = iomd_ack_irq_a, | 38 | .irq_ack = iomd_ack_irq_a, |
39 | .mask = iomd_mask_irq_a, | 39 | .irq_mask = iomd_mask_irq_a, |
40 | .unmask = iomd_unmask_irq_a, | 40 | .irq_unmask = iomd_unmask_irq_a, |
41 | }; | 41 | }; |
42 | 42 | ||
43 | static void iomd_mask_irq_b(unsigned int irq) | 43 | static void iomd_mask_irq_b(struct irq_data *d) |
44 | { | 44 | { |
45 | unsigned int val, mask; | 45 | unsigned int val, mask; |
46 | 46 | ||
47 | mask = 1 << (irq & 7); | 47 | mask = 1 << (d->irq & 7); |
48 | val = iomd_readb(IOMD_IRQMASKB); | 48 | val = iomd_readb(IOMD_IRQMASKB); |
49 | iomd_writeb(val & ~mask, IOMD_IRQMASKB); | 49 | iomd_writeb(val & ~mask, IOMD_IRQMASKB); |
50 | } | 50 | } |
51 | 51 | ||
52 | static void iomd_unmask_irq_b(unsigned int irq) | 52 | static void iomd_unmask_irq_b(struct irq_data *d) |
53 | { | 53 | { |
54 | unsigned int val, mask; | 54 | unsigned int val, mask; |
55 | 55 | ||
56 | mask = 1 << (irq & 7); | 56 | mask = 1 << (d->irq & 7); |
57 | val = iomd_readb(IOMD_IRQMASKB); | 57 | val = iomd_readb(IOMD_IRQMASKB); |
58 | iomd_writeb(val | mask, IOMD_IRQMASKB); | 58 | iomd_writeb(val | mask, IOMD_IRQMASKB); |
59 | } | 59 | } |
60 | 60 | ||
61 | static struct irq_chip iomd_b_chip = { | 61 | static struct irq_chip iomd_b_chip = { |
62 | .ack = iomd_mask_irq_b, | 62 | .irq_ack = iomd_mask_irq_b, |
63 | .mask = iomd_mask_irq_b, | 63 | .irq_mask = iomd_mask_irq_b, |
64 | .unmask = iomd_unmask_irq_b, | 64 | .irq_unmask = iomd_unmask_irq_b, |
65 | }; | 65 | }; |
66 | 66 | ||
67 | static void iomd_mask_irq_dma(unsigned int irq) | 67 | static void iomd_mask_irq_dma(struct irq_data *d) |
68 | { | 68 | { |
69 | unsigned int val, mask; | 69 | unsigned int val, mask; |
70 | 70 | ||
71 | mask = 1 << (irq & 7); | 71 | mask = 1 << (d->irq & 7); |
72 | val = iomd_readb(IOMD_DMAMASK); | 72 | val = iomd_readb(IOMD_DMAMASK); |
73 | iomd_writeb(val & ~mask, IOMD_DMAMASK); | 73 | iomd_writeb(val & ~mask, IOMD_DMAMASK); |
74 | } | 74 | } |
75 | 75 | ||
76 | static void iomd_unmask_irq_dma(unsigned int irq) | 76 | static void iomd_unmask_irq_dma(struct irq_data *d) |
77 | { | 77 | { |
78 | unsigned int val, mask; | 78 | unsigned int val, mask; |
79 | 79 | ||
80 | mask = 1 << (irq & 7); | 80 | mask = 1 << (d->irq & 7); |
81 | val = iomd_readb(IOMD_DMAMASK); | 81 | val = iomd_readb(IOMD_DMAMASK); |
82 | iomd_writeb(val | mask, IOMD_DMAMASK); | 82 | iomd_writeb(val | mask, IOMD_DMAMASK); |
83 | } | 83 | } |
84 | 84 | ||
85 | static struct irq_chip iomd_dma_chip = { | 85 | static struct irq_chip iomd_dma_chip = { |
86 | .ack = iomd_mask_irq_dma, | 86 | .irq_ack = iomd_mask_irq_dma, |
87 | .mask = iomd_mask_irq_dma, | 87 | .irq_mask = iomd_mask_irq_dma, |
88 | .unmask = iomd_unmask_irq_dma, | 88 | .irq_unmask = iomd_unmask_irq_dma, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static void iomd_mask_irq_fiq(unsigned int irq) | 91 | static void iomd_mask_irq_fiq(struct irq_data *d) |
92 | { | 92 | { |
93 | unsigned int val, mask; | 93 | unsigned int val, mask; |
94 | 94 | ||
95 | mask = 1 << (irq & 7); | 95 | mask = 1 << (d->irq & 7); |
96 | val = iomd_readb(IOMD_FIQMASK); | 96 | val = iomd_readb(IOMD_FIQMASK); |
97 | iomd_writeb(val & ~mask, IOMD_FIQMASK); | 97 | iomd_writeb(val & ~mask, IOMD_FIQMASK); |
98 | } | 98 | } |
99 | 99 | ||
100 | static void iomd_unmask_irq_fiq(unsigned int irq) | 100 | static void iomd_unmask_irq_fiq(struct irq_data *d) |
101 | { | 101 | { |
102 | unsigned int val, mask; | 102 | unsigned int val, mask; |
103 | 103 | ||
104 | mask = 1 << (irq & 7); | 104 | mask = 1 << (d->irq & 7); |
105 | val = iomd_readb(IOMD_FIQMASK); | 105 | val = iomd_readb(IOMD_FIQMASK); |
106 | iomd_writeb(val | mask, IOMD_FIQMASK); | 106 | iomd_writeb(val | mask, IOMD_FIQMASK); |
107 | } | 107 | } |
108 | 108 | ||
109 | static struct irq_chip iomd_fiq_chip = { | 109 | static struct irq_chip iomd_fiq_chip = { |
110 | .ack = iomd_mask_irq_fiq, | 110 | .irq_ack = iomd_mask_irq_fiq, |
111 | .mask = iomd_mask_irq_fiq, | 111 | .irq_mask = iomd_mask_irq_fiq, |
112 | .unmask = iomd_unmask_irq_fiq, | 112 | .irq_unmask = iomd_unmask_irq_fiq, |
113 | }; | 113 | }; |
114 | 114 | ||
115 | void __init rpc_init_irq(void) | 115 | void __init rpc_init_irq(void) |