diff options
author | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:16:04 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:16:04 -0400 |
commit | 2533c2cfbff8f0ee53b8448d6362b54c272125aa (patch) | |
tree | e254f804f2da2f79e66ea71a1e534574ae9da2ac /arch/arm/mach-omap1/board-h2.c | |
parent | a2cb960f171228e17a28ff734289be60b75417c7 (diff) | |
parent | 21235bdb8aa5e8320b08f79525a45185a52b07df (diff) |
Merge branch 'fixes-gpio-to-irq' into fixes
Conflicts:
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/plat-omap/include/plat/gpio.h
drivers/input/serio/ams_delta_serio.c
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index c3068622fdcb..553a2e535764 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -245,8 +245,6 @@ static struct resource h2_smc91x_resources[] = { | |||
245 | .flags = IORESOURCE_MEM, | 245 | .flags = IORESOURCE_MEM, |
246 | }, | 246 | }, |
247 | [1] = { | 247 | [1] = { |
248 | .start = OMAP_GPIO_IRQ(0), | ||
249 | .end = OMAP_GPIO_IRQ(0), | ||
250 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE, | 248 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE, |
251 | }, | 249 | }, |
252 | }; | 250 | }; |
@@ -359,11 +357,9 @@ static struct tps65010_board tps_board = { | |||
359 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { | 357 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { |
360 | { | 358 | { |
361 | I2C_BOARD_INFO("tps65010", 0x48), | 359 | I2C_BOARD_INFO("tps65010", 0x48), |
362 | .irq = OMAP_GPIO_IRQ(58), | ||
363 | .platform_data = &tps_board, | 360 | .platform_data = &tps_board, |
364 | }, { | 361 | }, { |
365 | I2C_BOARD_INFO("isp1301_omap", 0x2d), | 362 | I2C_BOARD_INFO("isp1301_omap", 0x2d), |
366 | .irq = OMAP_GPIO_IRQ(2), | ||
367 | }, | 363 | }, |
368 | }; | 364 | }; |
369 | 365 | ||
@@ -428,8 +424,12 @@ static void __init h2_init(void) | |||
428 | omap_cfg_reg(E19_1610_KBR4); | 424 | omap_cfg_reg(E19_1610_KBR4); |
429 | omap_cfg_reg(N19_1610_KBR5); | 425 | omap_cfg_reg(N19_1610_KBR5); |
430 | 426 | ||
427 | h2_smc91x_resources[1].start = gpio_to_irq(0); | ||
428 | h2_smc91x_resources[1].end = gpio_to_irq(0); | ||
431 | platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices)); | 429 | platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices)); |
432 | omap_serial_init(); | 430 | omap_serial_init(); |
431 | h2_i2c_board_info[0].irq = gpio_to_irq(58); | ||
432 | h2_i2c_board_info[1].irq = gpio_to_irq(2); | ||
433 | omap_register_i2c_bus(1, 100, h2_i2c_board_info, | 433 | omap_register_i2c_bus(1, 100, h2_i2c_board_info, |
434 | ARRAY_SIZE(h2_i2c_board_info)); | 434 | ARRAY_SIZE(h2_i2c_board_info)); |
435 | omap1_usb_init(&h2_usb_config); | 435 | omap1_usb_init(&h2_usb_config); |