diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 02369be990c..05dadc33c0f 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -72,7 +72,7 @@ #define NAND_CS 0 -// #define MPUIRQ_GPIO 31 +#define MPUIRQ_GPIO 31 #define ATMEL_MXT_GPIO 105 #define TPS_SYS_NIRQ 0 #define USB_IRQ 124 @@ -275,6 +275,7 @@ static struct i2c_board_info __initdata omap3h1_i2c2_board_info[] = { I2C_BOARD_INFO("mpu6515", 0x68), // This is needed for the interrupt wake. IH_GPIO_BASE changed in 3.10 // .irq = (IH_GPIO_BASE + MPUIRQ_GPIO), + .irq = 0, .platform_data = &mpu_data, }, { @@ -305,7 +306,7 @@ static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = { static int __init omap3_h1_i2c_init(void) { - // int acc_irq; + int acc_irq; /* In Linux 3.10 we need to request an IRQ through * gpio_to_irq. This means it can't be set at compile time, and @@ -313,13 +314,13 @@ static int __init omap3_h1_i2c_init(void) */ gpio_request_one(ATMEL_MXT_GPIO, GPIOF_IN, "atmel_mxt_ts CHG"); - // gpio_request_one(MPUIRQ_GPIO, GPIOF_IN, "mpu6515 IRQ pin"); + gpio_request_one(MPUIRQ_GPIO, GPIOF_IN, "mpu6515 IRQ pin"); - // acc_irq = gpio_to_irq(MPUIRQ_GPIO); + acc_irq = gpio_to_irq(MPUIRQ_GPIO); #ifdef CONFIG_MACH_OMAP3_H1_DVT2 omap3h1_i2c2_board_info[2].irq = gpio_to_irq(ATMEL_MXT_GPIO); - // omap3h1_i2c2_board_info[0].irq = acc_irq; + omap3h1_i2c2_board_info[0].irq = acc_irq; // ((struct tps65910_board *) (omap3h1_i2c1_board_info[0].platform_data))->irq = // gpio_to_irq (TPS_SYS_NIRQ); @@ -364,8 +365,8 @@ static void __init omap3_h1_init(void) NAND_BUSWIDTH_16, NULL); omap_sdrc_init(mt29c8g96_sdrc_params, mt29c8g96_sdrc_params); - - omap3_h1_i2c_init(); + + omap3_h1_i2c_init(); platform_add_devices(omap3h1_devices, ARRAY_SIZE(omap3h1_devices)); |