diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/arm/mach-mx3/mx31ads.c | |
| parent | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-mx3/mx31ads.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31ads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c index a6d6efefa6aa..30e2767a78ae 100644 --- a/arch/arm/mach-mx3/mx31ads.c +++ b/arch/arm/mach-mx3/mx31ads.c | |||
| @@ -187,7 +187,7 @@ static void __init mx31ads_init_expio(void) | |||
| 187 | /* | 187 | /* |
| 188 | * Configure INT line as GPIO input | 188 | * Configure INT line as GPIO input |
| 189 | */ | 189 | */ |
| 190 | mxc_iomux_setup_pin(IOMUX_MODE(MX31_PIN_GPIO1_4, IOMUX_CONFIG_GPIO), "expio"); | 190 | mxc_iomux_alloc_pin(IOMUX_MODE(MX31_PIN_GPIO1_4, IOMUX_CONFIG_GPIO), "expio"); |
| 191 | 191 | ||
| 192 | /* disable the interrupt and clear the status */ | 192 | /* disable the interrupt and clear the status */ |
| 193 | __raw_writew(0xFFFF, PBC_INTMASK_CLEAR_REG); | 193 | __raw_writew(0xFFFF, PBC_INTMASK_CLEAR_REG); |
| @@ -511,7 +511,7 @@ static struct map_desc mx31ads_io_desc[] __initdata = { | |||
| 511 | */ | 511 | */ |
| 512 | static void __init mx31ads_map_io(void) | 512 | static void __init mx31ads_map_io(void) |
| 513 | { | 513 | { |
| 514 | mxc_map_io(); | 514 | mx31_map_io(); |
| 515 | iotable_init(mx31ads_io_desc, ARRAY_SIZE(mx31ads_io_desc)); | 515 | iotable_init(mx31ads_io_desc, ARRAY_SIZE(mx31ads_io_desc)); |
| 516 | } | 516 | } |
| 517 | 517 | ||