diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2011-11-01 17:12:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2011-11-01 17:12:22 +0100 |
| commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (patch) | |
| tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 /arch/arm/mach-mx5/board-mx53_ard.c | |
| parent | ARM: gic: use module.h instead of export.h (diff) | |
| parent | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.tar.gz linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.tar.bz2 linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.zip | |
Merge branch 'imx/devel' into next/dt
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mx5/board-mx53_ard.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx53_ard.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-mx5/board-mx53_ard.c index 9b4395d7a07c..0d7f0fffb23a 100644 --- a/arch/arm/mach-mx5/board-mx53_ard.c +++ b/arch/arm/mach-mx5/board-mx53_ard.c @@ -134,8 +134,8 @@ static struct resource ard_smsc911x_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = gpio_to_irq(ARD_ETHERNET_INT_B), - .end = gpio_to_irq(ARD_ETHERNET_INT_B), + .start = IMX_GPIO_TO_IRQ(ARD_ETHERNET_INT_B), + .end = IMX_GPIO_TO_IRQ(ARD_ETHERNET_INT_B), .flags = IORESOURCE_IRQ, }, }; @@ -238,6 +238,7 @@ static void __init mx53_ard_board_init(void) imx53_add_imx_i2c(1, &mx53_ard_i2c2_data); imx53_add_imx_i2c(2, &mx53_ard_i2c3_data); imx_add_gpio_keys(&ard_button_data); + imx53_add_ahci_imx(); } static void __init mx53_ard_timer_init(void) @@ -253,6 +254,7 @@ MACHINE_START(MX53_ARD, "Freescale MX53 ARD Board") .map_io = mx53_map_io, .init_early = imx53_init_early, .init_irq = mx53_init_irq, + .handle_irq = imx53_handle_irq, .timer = &mx53_ard_timer, .init_machine = mx53_ard_board_init, MACHINE_END |