aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx/vision_ep9307.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-ep93xx/vision_ep9307.c')
-rw-r--r--arch/arm/mach-ep93xx/vision_ep9307.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 03dd4012043e..ba156eb225e8 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -32,11 +32,15 @@
32#include <mach/hardware.h> 32#include <mach/hardware.h>
33#include <mach/fb.h> 33#include <mach/fb.h>
34#include <mach/ep93xx_spi.h> 34#include <mach/ep93xx_spi.h>
35#include <mach/gpio-ep93xx.h>
35 36
37#include <asm/hardware/vic.h>
36#include <asm/mach-types.h> 38#include <asm/mach-types.h>
37#include <asm/mach/map.h> 39#include <asm/mach/map.h>
38#include <asm/mach/arch.h> 40#include <asm/mach/arch.h>
39 41
42#include "soc.h"
43
40/************************************************************************* 44/*************************************************************************
41 * Static I/O mappings for the FPGA 45 * Static I/O mappings for the FPGA
42 *************************************************************************/ 46 *************************************************************************/
@@ -153,7 +157,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = {
153 }, { 157 }, {
154 I2C_BOARD_INFO("pca9539", 0x74), 158 I2C_BOARD_INFO("pca9539", 0x74),
155 .platform_data = &pca953x_74_gpio_data, 159 .platform_data = &pca953x_74_gpio_data,
156 .irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)),
157 }, { 160 }, {
158 I2C_BOARD_INFO("pca9539", 0x75), 161 I2C_BOARD_INFO("pca9539", 0x75),
159 .platform_data = &pca953x_75_gpio_data, 162 .platform_data = &pca953x_75_gpio_data,
@@ -348,6 +351,8 @@ static void __init vision_init_machine(void)
348 "pca9539:74")) 351 "pca9539:74"))
349 pr_warn("cannot request interrupt gpio for pca9539:74\n"); 352 pr_warn("cannot request interrupt gpio for pca9539:74\n");
350 353
354 vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7));
355
351 ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info, 356 ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info,
352 ARRAY_SIZE(vision_i2c_info)); 357 ARRAY_SIZE(vision_i2c_info));
353 ep93xx_register_spi(&vision_spi_master, vision_spi_board_info, 358 ep93xx_register_spi(&vision_spi_master, vision_spi_board_info,
@@ -359,6 +364,7 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307")
359 .atag_offset = 0x100, 364 .atag_offset = 0x100,
360 .map_io = vision_map_io, 365 .map_io = vision_map_io,
361 .init_irq = ep93xx_init_irq, 366 .init_irq = ep93xx_init_irq,
367 .handle_irq = vic_handle_irq,
362 .timer = &ep93xx_timer, 368 .timer = &ep93xx_timer,
363 .init_machine = vision_init_machine, 369 .init_machine = vision_init_machine,
364 .restart = ep93xx_restart, 370 .restart = ep93xx_restart,