diff for duplicates of <20100705081453.GD15951@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index e48669e..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="irda.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index aa1e22a..0000000 --- a/a/2.txt +++ /dev/null @@ -1,63 +0,0 @@ ->From e2bed14099b0d15514d3e542742fa9310d9bf52c Mon Sep 17 00:00:00 2001 -From: Christoph Egger <siccegge@cs.fau.de> -Date: Wed, 30 Jun 2010 15:55:22 +0000 -Subject: [PATCH] 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> - -diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c -index ee46974..2efa427 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 = { - - #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); -diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c -index 2d9ff0f..9044dcf 100644 ---- a/arch/arm/mach-omap2/board-h4.c -+++ b/arch/arm/mach-omap2/board-h4.c -@@ -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); diff --git a/a/content_digest b/N1/content_digest index 8db2da3..f2f3f6c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,10 @@ "ref\0cover.1277911345.git.siccegge@cs.fau.de\0" "ref\0b7209c2cb666c73a3affbb44c2637a4f2086af08.1277911346.git.siccegge@cs.fau.de\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 05/33] Removing dead OMAP_IR\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 05/33] Removing dead OMAP_IR\0" "Date\0Mon, 5 Jul 2010 11:14:55 +0300\0" - "To\0Christoph Egger <siccegge@cs.fau.de>\0" - "Cc\0Russell King <linux@arm.linux.org.uk>" - Ladislav Michl <ladis@linux-mips.org> - Kalle Valo <kalle.valo@iki.fi> - Kevin Hilman <khilman@deeprootsystems.com> - Paul Walmsley <paul@pwsan.com> - Santosh Shilimkar <santosh.shilimkar@ti.com> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " vamos@i4.informatik.uni-erlangen.de\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Christoph Egger <siccegge@cs.fau.de> [100630 18:49]:\n" "> OMAP_IR doesn't exist in Kconfig, therefore removing all references\n" @@ -26,71 +16,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0irda.patch\0" - "b\0" - ">From e2bed14099b0d15514d3e542742fa9310d9bf52c Mon Sep 17 00:00:00 2001\n" - "From: Christoph Egger <siccegge@cs.fau.de>\n" - "Date: Wed, 30 Jun 2010 15:55:22 +0000\n" - "Subject: [PATCH] Removing dead OMAP_IR\n" - "\n" - "OMAP_IR doesn't exist in Kconfig, therefore removing all references\n" - "for it from the source code.\n" - "\n" - "Signed-off-by: Christoph Egger <siccegge@cs.fau.de>\n" - "[tony@atomide.com: updated for new mux code]\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c\n" - "index ee46974..2efa427 100644\n" - "--- a/arch/arm/mach-omap1/board-h2.c\n" - "+++ b/arch/arm/mach-omap1/board-h2.c\n" - "@@ -292,15 +292,6 @@ static struct platform_device h2_kp_device = {\n" - " \n" - " #define H2_IRDA_FIRSEL_GPIO_PIN\t17\n" - " \n" - "-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)\n" - "-static int h2_transceiver_mode(struct device *dev, int state)\n" - "-{\n" - "-\t/* SIR when low, else MIR/FIR when HIGH */\n" - "-\tgpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));\n" - "-\treturn 0;\n" - "-}\n" - "-#endif\n" - "-\n" - " static struct omap_irda_config h2_irda_data = {\n" - " \t.transceiver_cap\t= IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,\n" - " \t.rx_channel\t\t= OMAP_DMA_UART3_RX,\n" - "@@ -450,15 +441,6 @@ static void __init h2_init(void)\n" - " \tomap_cfg_reg(E19_1610_KBR4);\n" - " \tomap_cfg_reg(N19_1610_KBR5);\n" - " \n" - "-\t/* Irda */\n" - "-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)\n" - "-\tomap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);\n" - "-\tif (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, \"IRDA mode\") < 0)\n" - "-\t\tBUG();\n" - "-\tgpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);\n" - "-\th2_irda_data.transceiver_mode = h2_transceiver_mode;\n" - "-#endif\n" - "-\n" - " \tplatform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));\n" - " \tomap_board_config = h2_config;\n" - " \tomap_board_config_size = ARRAY_SIZE(h2_config);\n" - "diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c\n" - "index 2d9ff0f..9044dcf 100644\n" - "--- a/arch/arm/mach-omap2/board-h4.c\n" - "+++ b/arch/arm/mach-omap2/board-h4.c\n" - "@@ -356,10 +356,6 @@ static void __init omap_h4_init(void)\n" - " \t * You have to mux them off in device drivers later on\n" - " \t * if not needed.\n" - " \t */\n" - "-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)\n" - "-\tomap_mux_init_signal(\"uart3_tx_irtx.uart3_tx_irtx\", 0);\n" - "-\tomap_mux_init_signal(\"uart3_rx_irrx.uart3_rx_irrx\", 0);\n" - "-#endif\n" - " \n" - " #if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)\n" - " \tomap_mux_init_gpio(88, OMAP_PULL_ENA | OMAP_PULL_UP);" -5160fe4eb228ce3019d3bed64e9291ded62ec7bdb00fe71930aa0658b44213da +a02d6cd89477fe91898ec57a35e6245d114f0a8c30acc5877c8584ce86db8787
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.