diff options
Diffstat (limited to 'arch/arm/mach-mx3/mach-mx31ads.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31ads.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c index b993b9bf6179..88b97d62b57e 100644 --- a/arch/arm/mach-mx3/mach-mx31ads.c +++ b/arch/arm/mach-mx3/mach-mx31ads.c | |||
@@ -162,9 +162,9 @@ static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc) | |||
162 | * Disable an expio pin's interrupt by setting the bit in the imr. | 162 | * Disable an expio pin's interrupt by setting the bit in the imr. |
163 | * @param irq an expio virtual irq number | 163 | * @param irq an expio virtual irq number |
164 | */ | 164 | */ |
165 | static void expio_mask_irq(u32 irq) | 165 | static void expio_mask_irq(struct irq_data *d) |
166 | { | 166 | { |
167 | u32 expio = MXC_IRQ_TO_EXPIO(irq); | 167 | u32 expio = MXC_IRQ_TO_EXPIO(d->irq); |
168 | /* mask the interrupt */ | 168 | /* mask the interrupt */ |
169 | __raw_writew(1 << expio, PBC_INTMASK_CLEAR_REG); | 169 | __raw_writew(1 << expio, PBC_INTMASK_CLEAR_REG); |
170 | __raw_readw(PBC_INTMASK_CLEAR_REG); | 170 | __raw_readw(PBC_INTMASK_CLEAR_REG); |
@@ -174,9 +174,9 @@ static void expio_mask_irq(u32 irq) | |||
174 | * Acknowledge an expanded io pin's interrupt by clearing the bit in the isr. | 174 | * Acknowledge an expanded io pin's interrupt by clearing the bit in the isr. |
175 | * @param irq an expanded io virtual irq number | 175 | * @param irq an expanded io virtual irq number |
176 | */ | 176 | */ |
177 | static void expio_ack_irq(u32 irq) | 177 | static void expio_ack_irq(struct irq_data *d) |
178 | { | 178 | { |
179 | u32 expio = MXC_IRQ_TO_EXPIO(irq); | 179 | u32 expio = MXC_IRQ_TO_EXPIO(d->irq); |
180 | /* clear the interrupt status */ | 180 | /* clear the interrupt status */ |
181 | __raw_writew(1 << expio, PBC_INTSTATUS_REG); | 181 | __raw_writew(1 << expio, PBC_INTSTATUS_REG); |
182 | } | 182 | } |
@@ -185,18 +185,18 @@ static void expio_ack_irq(u32 irq) | |||
185 | * Enable a expio pin's interrupt by clearing the bit in the imr. | 185 | * Enable a expio pin's interrupt by clearing the bit in the imr. |
186 | * @param irq a expio virtual irq number | 186 | * @param irq a expio virtual irq number |
187 | */ | 187 | */ |
188 | static void expio_unmask_irq(u32 irq) | 188 | static void expio_unmask_irq(struct irq_data *d) |
189 | { | 189 | { |
190 | u32 expio = MXC_IRQ_TO_EXPIO(irq); | 190 | u32 expio = MXC_IRQ_TO_EXPIO(d->irq); |
191 | /* unmask the interrupt */ | 191 | /* unmask the interrupt */ |
192 | __raw_writew(1 << expio, PBC_INTMASK_SET_REG); | 192 | __raw_writew(1 << expio, PBC_INTMASK_SET_REG); |
193 | } | 193 | } |
194 | 194 | ||
195 | static struct irq_chip expio_irq_chip = { | 195 | static struct irq_chip expio_irq_chip = { |
196 | .name = "EXPIO(CPLD)", | 196 | .name = "EXPIO(CPLD)", |
197 | .ack = expio_ack_irq, | 197 | .irq_ack = expio_ack_irq, |
198 | .mask = expio_mask_irq, | 198 | .irq_mask = expio_mask_irq, |
199 | .unmask = expio_unmask_irq, | 199 | .irq_unmask = expio_unmask_irq, |
200 | }; | 200 | }; |
201 | 201 | ||
202 | static void __init mx31ads_init_expio(void) | 202 | static void __init mx31ads_init_expio(void) |