diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-02-08 09:53:44 -0700 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 06:56:39 +0000 |
commit | e9c6c5dfd1dba03802b98aea518c08ab48cbbcc4 (patch) | |
tree | a7219d12d3b7333cf7e85c9c163904c0aeb7c9e6 /arch | |
parent | ffafe770a4160862476405a442d28ee48d2249ef (diff) | |
download | linux-3.10-e9c6c5dfd1dba03802b98aea518c08ab48cbbcc4.tar.gz linux-3.10-e9c6c5dfd1dba03802b98aea518c08ab48cbbcc4.tar.bz2 linux-3.10-e9c6c5dfd1dba03802b98aea518c08ab48cbbcc4.zip |
ep93xx: fix build of vision_ep93xx.c
Fix build breakage due to the following commits:
Commit bd5f12a24766c1f299def0a78b008d4746f528f2
ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
Commit 257af9f9725aa8a863b306659208a031135d59e7
ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driver
The vision_ep9307 machine uses the ep93xx build-in gpios and needs to
include <mach/gpio-ep93xx.h> to pickup the defines.
The gpio_to_irq() call is now a callback to the gpio-ep93xx.c driver
and cannot be used as a constant initializer for the .irq member of
struct i2c_board_info.
Signed-off-by: Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ryan Mallon <rmallon@gmail.com>
Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ep93xx/vision_ep9307.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index 03dd4012043..d5fb44f16d3 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c @@ -32,6 +32,7 @@ #include <mach/hardware.h> #include <mach/fb.h> #include <mach/ep93xx_spi.h> +#include <mach/gpio-ep93xx.h> #include <asm/mach-types.h> #include <asm/mach/map.h> @@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = { }, { I2C_BOARD_INFO("pca9539", 0x74), .platform_data = &pca953x_74_gpio_data, - .irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)), }, { I2C_BOARD_INFO("pca9539", 0x75), .platform_data = &pca953x_75_gpio_data, @@ -348,6 +348,8 @@ static void __init vision_init_machine(void) "pca9539:74")) pr_warn("cannot request interrupt gpio for pca9539:74\n"); + vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)); + ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info, ARRAY_SIZE(vision_i2c_info)); ep93xx_register_spi(&vision_spi_master, vision_spi_board_info, |