diff options
author | Christoph Egger <siccegge@cs.fau.de> | 2010-07-05 09:31:53 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:53 -0400 |
commit | 4705c1ca8b7c7cca23d7e534c830e5d6ac914535 (patch) | |
tree | 9211048f85c324618ebcb1dbbcbc22a26480100e /arch/arm/mach-omap1 | |
parent | 312b80a1e52853cd2c6db9623e8fd9aec822cd40 (diff) |
Removing dead OMAP_IR
OMAP_IR doesn't exist in Kconfig, therefore removing all references
for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
[tony@atomide.com: updated for new mux code]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index ee469744466b..2efa4272d2e3 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = { | |||
292 | 292 | ||
293 | #define H2_IRDA_FIRSEL_GPIO_PIN 17 | 293 | #define H2_IRDA_FIRSEL_GPIO_PIN 17 |
294 | 294 | ||
295 | #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE) | ||
296 | static int h2_transceiver_mode(struct device *dev, int state) | ||
297 | { | ||
298 | /* SIR when low, else MIR/FIR when HIGH */ | ||
299 | gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE)); | ||
300 | return 0; | ||
301 | } | ||
302 | #endif | ||
303 | |||
304 | static struct omap_irda_config h2_irda_data = { | 295 | static struct omap_irda_config h2_irda_data = { |
305 | .transceiver_cap = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE, | 296 | .transceiver_cap = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE, |
306 | .rx_channel = OMAP_DMA_UART3_RX, | 297 | .rx_channel = OMAP_DMA_UART3_RX, |
@@ -450,15 +441,6 @@ static void __init h2_init(void) | |||
450 | omap_cfg_reg(E19_1610_KBR4); | 441 | omap_cfg_reg(E19_1610_KBR4); |
451 | omap_cfg_reg(N19_1610_KBR5); | 442 | omap_cfg_reg(N19_1610_KBR5); |
452 | 443 | ||
453 | /* Irda */ | ||
454 | #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE) | ||
455 | omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A); | ||
456 | if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0) | ||
457 | BUG(); | ||
458 | gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0); | ||
459 | h2_irda_data.transceiver_mode = h2_transceiver_mode; | ||
460 | #endif | ||
461 | |||
462 | platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices)); | 444 | platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices)); |
463 | omap_board_config = h2_config; | 445 | omap_board_config = h2_config; |
464 | omap_board_config_size = ARRAY_SIZE(h2_config); | 446 | omap_board_config_size = ARRAY_SIZE(h2_config); |