diff mbox

OMAP2 H4: fix build by removing IRDA support

Message ID alpine.DEB.2.00.0904251551150.28378@utopia.booyaka.com (mailing list archive)
State Accepted
Commit 5905102dbeebe4d733b646caad5eced616b9d65a
Headers show

Commit Message

Paul Walmsley April 25, 2009, 9:52 p.m. UTC 
Commit 5c2c33ae65b949b8c901754090eb95d7b77dc5e4 breaks H4 builds, so 
remove the gpio_expa IRDA support in the same manner as that commit did 
for H3.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-h4.c |   39 ++++-----------------------------------
 1 files changed, 4 insertions(+), 35 deletions(-)

Comments

Tony Lindgren April 28, 2009, 1:23 a.m. UTC | #1 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 5905102dbeebe4d733b646caad5eced616b9d65a

PatchWorks
http://patchwork.kernel.org/patch/19961/

Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5905102dbeebe4d733b646caad5eced616b9d65a


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index cbca22a..6145139 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -186,43 +186,12 @@  static struct platform_device h4_flash_device = {
 	.resource	= &h4_flash_resource,
 };
 
-#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
-
-/* Select between the IrDA and aGPS module */
-static int h4_select_irda(struct device *dev, int state)
-{
-	/* U192.P0 = high for IRDA; else AGPS */
-	gpio_set_value_cansleep(H4_GPIO_IRDA_AGPSn, state & IR_SEL);
-
-	/* NOTE:  UART3 can also hook up to a DB9 or to GSM ... */
-	return 0;
-}
-
-static void set_trans_mode(struct work_struct *work)
-{
-	struct omap_irda_config *irda_config =
-		container_of(work, struct omap_irda_config, gpio_expa.work);
-	int mode = irda_config->mode;
-
-	/* U191.P0 = low for SIR; else MIR/FIR */
-	gpio_set_value_cansleep(H4_GPIO_IRDA_FIRSEL, !(mode & IR_SIRMODE));
-}
-
-static int h4_transceiver_mode(struct device *dev, int mode)
-{
-	struct omap_irda_config *irda_config = dev->platform_data;
-
-	irda_config->mode = mode;
-	cancel_delayed_work(&irda_config->gpio_expa);
-	PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);
-	schedule_delayed_work(&irda_config->gpio_expa, 0);
-
-	return 0;
-}
-#else
+/*
+ * IRDA code removed due to dependency on dead gpio_expa code -
+ * feel free to fix and add back in if you are a user
+ */
 static int h4_select_irda(struct device *dev, int state) { return 0; }
 static int h4_transceiver_mode(struct device *dev, int mode) { return 0; }
-#endif
 
 static struct omap_irda_config h4_irda_data = {
 	.transceiver_cap	= IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,