Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4705c1ca authored by Christoph Egger's avatar Christoph Egger Committed by Tony Lindgren
Browse files

Removing dead OMAP_IR 



OMAP_IR doesn't exist in Kconfig, therefore removing all references
for it from the source code.

Signed-off-by: default avatarChristoph Egger <siccegge@cs.fau.de>
[tony@atomide.com: updated for new mux code]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 312b80a1

arch/arm/mach-omap1/board-h2.c

+0 −18
Original line number Diff line number Diff line
@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = { 


#define H2_IRDA_FIRSEL_GPIO_PIN	17



#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)

static int h2_transceiver_mode(struct device *dev, int state)

{

	/* SIR when low, else MIR/FIR when HIGH */

	gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));

	return 0;

}

#endif



static struct omap_irda_config h2_irda_data = {

	.transceiver_cap	= IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,

	.rx_channel		= OMAP_DMA_UART3_RX,
@@ -450,15 +441,6 @@ static void __init h2_init(void) 
	omap_cfg_reg(E19_1610_KBR4);

	omap_cfg_reg(N19_1610_KBR5);



	/* Irda */

#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)

	omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);

	if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)

		BUG();

	gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);

	h2_irda_data.transceiver_mode = h2_transceiver_mode;

#endif



	platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));

	omap_board_config = h2_config;

	omap_board_config_size = ARRAY_SIZE(h2_config);

arch/arm/mach-omap2/board-h4.c

+0 −4
Original line number Diff line number Diff line
@@ -356,10 +356,6 @@ static void __init omap_h4_init(void) 
	 * You have to mux them off in device drivers later on

	 * if not needed.

	 */

#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)

	omap_mux_init_signal("uart3_tx_irtx.uart3_tx_irtx", 0);

	omap_mux_init_signal("uart3_rx_irrx.uart3_rx_irrx", 0);

#endif



#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)

	omap_mux_init_gpio(88, OMAP_PULL_ENA | OMAP_PULL_UP);