Commit e9c6c5df authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Arnd Bergmann

ep93xx: fix build of vision_ep93xx.c

Fix build breakage due to the following commits:

Commit bd5f12a2
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics

Commit 257af9f9
  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: default avatarHartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarRyan Mallon <rmallon@gmail.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ffafe770
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <mach/ep93xx_spi.h> #include <mach/ep93xx_spi.h>
#include <mach/gpio-ep93xx.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
...@@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = { ...@@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = {
}, { }, {
I2C_BOARD_INFO("pca9539", 0x74), I2C_BOARD_INFO("pca9539", 0x74),
.platform_data = &pca953x_74_gpio_data, .platform_data = &pca953x_74_gpio_data,
.irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)),
}, { }, {
I2C_BOARD_INFO("pca9539", 0x75), I2C_BOARD_INFO("pca9539", 0x75),
.platform_data = &pca953x_75_gpio_data, .platform_data = &pca953x_75_gpio_data,
...@@ -348,6 +348,8 @@ static void __init vision_init_machine(void) ...@@ -348,6 +348,8 @@ static void __init vision_init_machine(void)
"pca9539:74")) "pca9539:74"))
pr_warn("cannot request interrupt gpio for pca9539:74\n"); 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, ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info,
ARRAY_SIZE(vision_i2c_info)); ARRAY_SIZE(vision_i2c_info));
ep93xx_register_spi(&vision_spi_master, vision_spi_board_info, ep93xx_register_spi(&vision_spi_master, vision_spi_board_info,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment