Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

H Hartley Sweeten and committed by
Arnd Bergmann
e9c6c5df ffafe770

+3 -1
+3 -1
arch/arm/mach-ep93xx/vision_ep9307.c
··· 32 32 #include <mach/hardware.h> 33 33 #include <mach/fb.h> 34 34 #include <mach/ep93xx_spi.h> 35 + #include <mach/gpio-ep93xx.h> 35 36 36 37 #include <asm/mach-types.h> 37 38 #include <asm/mach/map.h> ··· 154 153 }, { 155 154 I2C_BOARD_INFO("pca9539", 0x74), 156 155 .platform_data = &pca953x_74_gpio_data, 157 - .irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)), 158 156 }, { 159 157 I2C_BOARD_INFO("pca9539", 0x75), 160 158 .platform_data = &pca953x_75_gpio_data, ··· 347 347 if (gpio_request_one(EP93XX_GPIO_LINE_F(7), GPIOF_DIR_IN, 348 348 "pca9539:74")) 349 349 pr_warn("cannot request interrupt gpio for pca9539:74\n"); 350 + 351 + vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)); 350 352 351 353 ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info, 352 354 ARRAY_SIZE(vision_i2c_info));