diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 15:33:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 15:33:40 -0500 |
commit | 16c1020362083b320868c0deef492249089c3cd3 (patch) | |
tree | ff200df3502e6010745713275d69fd0a07e399cf /arch/arm/mach-mx3 | |
parent | 65e5d002b5ad220db2bf9557f53de5a98f7dab86 (diff) | |
parent | bbba75606963c82febf7bd2761ea848ac5d1a1bb (diff) |
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)
ARM: pxa: fix building issue of missing physmap.h
ARM: mmp: PXA910 drive strength FAST using wrong value
ARM: mmp: MMP2 drive strength FAST using wrong value
ARM: pxa: fix recursive calls in pxa_low_gpio_chip
AT91: Support for gsia18s board
AT91: Acme Systems FOX Board G20 board files
AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
ARM: pxa: fix suspend/resume array index miscalculation
ARM: pxa: use cpu_has_ipr() consistently in irq.c
ARM: pxa: remove unused variable in clock-pxa3xx.c
ARM: pxa: fix warning in zeus.c
ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
ARM mxs: clkdev related compile fixes
ARM i.MX mx31_3ds: Fix MC13783 regulator names
ARM: plat-stmp3xxx: irq_data conversion.
ARM: plat-spear: irq_data conversion.
ARM: plat-orion: irq_data conversion.
ARM: plat-omap: irq_data conversion.
ARM: plat-nomadik: irq_data conversion.
ARM: plat-mxc: irq_data conversion.
...
Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
Buytenhek's irq_data conversion clashing with some omap irq updates)
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31_3ds.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31ads.c | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c index 899a969e92fa..0d65db885be7 100644 --- a/arch/arm/mach-mx3/mach-mx31_3ds.c +++ b/arch/arm/mach-mx3/mach-mx31_3ds.c | |||
@@ -147,10 +147,10 @@ static struct mc13783_regulator_init_data mx31_3ds_regulators[] = { | |||
147 | .init_data = &pwgtx_init, | 147 | .init_data = &pwgtx_init, |
148 | }, { | 148 | }, { |
149 | 149 | ||
150 | .id = MC13783_REGU_GPO1, /* Turn on 1.8V */ | 150 | .id = MC13783_REG_GPO1, /* Turn on 1.8V */ |
151 | .init_data = &gpo_init, | 151 | .init_data = &gpo_init, |
152 | }, { | 152 | }, { |
153 | .id = MC13783_REGU_GPO3, /* Turn on 3.3V */ | 153 | .id = MC13783_REG_GPO3, /* Turn on 3.3V */ |
154 | .init_data = &gpo_init, | 154 | .init_data = &gpo_init, |
155 | }, | 155 | }, |
156 | }; | 156 | }; |
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) |