From: <sle...@us...> - 2007-07-09 22:35:13
|
Revision: 1124 http://svn.sourceforge.net/hackndev/?rev=1124&view=rev Author: sleep_walker Date: 2007-07-09 15:35:05 -0700 (Mon, 09 Jul 2007) Log Message: ----------- palmtt3: fixing IrDA, removing useless dependencies in mmc-card led trigger Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c linux4palm/linux/trunk/drivers/leds/Kconfig linux4palm/linux/trunk/include/linux/leds.h Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c 2007-07-08 20:04:44 UTC (rev 1123) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c 2007-07-09 22:35:05 UTC (rev 1124) @@ -42,6 +42,7 @@ #include <asm/arch/palmtt3-gpio.h> #include <asm/arch/tps65010.h> +//#include "palmtt3_bt.h" #include "../generic.h" #define DEBUG 1 @@ -214,7 +215,6 @@ /*** IRDA ***/ - static void palmtt3_irda_transceiver_mode(struct device *dev, int mode) { unsigned long flags; @@ -222,21 +222,19 @@ local_irq_save(flags); if (mode & IR_SIRMODE){ - printk (KERN_INFO "IrDA: setting mode to SIR\n"); + printk ("IrDA: setting mode to SIR\n"); } else if (mode & IR_FIRMODE){ - printk (KERN_INFO "IrDA: setting mode to FIR\n"); + printk ("IrDA: setting mode to FIR\n"); } if (mode & IR_OFF){ - printk (KERN_INFO "IrDA: turning OFF\n"); + printk ("IrDA: turning OFF\n"); SET_GPIO(GPIO_NR_PALMTT3_IR_DISABLE, 1); + } else { printk (KERN_INFO "IrDA: turning ON\n"); SET_GPIO(GPIO_NR_PALMTT3_IR_DISABLE, 0); - SET_GPIO(GPIO46_STRXD_MD, 1); - mdelay(30); - SET_GPIO(GPIO46_STRXD_MD, 0); } local_irq_restore(flags); @@ -244,7 +242,7 @@ static struct pxaficp_platform_data palmtt3_ficp_platform_data = { - .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, + .transceiver_cap = IR_SIRMODE | IR_OFF, .transceiver_mode = palmtt3_irda_transceiver_mode, }; @@ -334,10 +332,6 @@ struct platform_pxa_serial_funcs palmtt3_hwuart = { .configure = palmtt3_hwuart_configure, -/* - .set_txrx = palmtt3_hwuart_set_txrx, - .get_txrx = NULL, -*/ .suspend = palmtt3_hwuart_suspend, .resume = palmtt3_hwuart_resume, }; Modified: linux4palm/linux/trunk/drivers/leds/Kconfig =================================================================== --- linux4palm/linux/trunk/drivers/leds/Kconfig 2007-07-08 20:04:44 UTC (rev 1123) +++ linux4palm/linux/trunk/drivers/leds/Kconfig 2007-07-09 22:35:05 UTC (rev 1124) @@ -197,8 +197,9 @@ If unsure, say Y. config LEDS_TRIGGER_MMC_CARD - bool "LED MMC Card Trigger" - depends on LEDS_TRIGGERS && ARCH_PXA && (MMC_PXA || MMC_WBSD_PALMT3) + tristate "LED MMC Card Trigger" + depends LEDS_TRIGGERS + default m help This allows LEDs to be controlled by MMC card activity on Intel PXA 25x/26x/27x MMC interface . If unsure, say Y. Modified: linux4palm/linux/trunk/include/linux/leds.h =================================================================== --- linux4palm/linux/trunk/include/linux/leds.h 2007-07-08 20:04:44 UTC (rev 1123) +++ linux4palm/linux/trunk/include/linux/leds.h 2007-07-09 22:35:05 UTC (rev 1124) @@ -174,7 +174,7 @@ #else #define ledtrig_ide_activity() do {} while(0) #endif -#ifdef CONFIG_LEDS_TRIGGER_MMC_CARD +#if defined(CONFIG_LEDS_TRIGGER_MMC_CARD) || defined(CONFIG_LEDS_TRIGGER_MMC_CARD_MODULE) extern void ledtrig_mmc_activity(void); #else #define ledtrig_mmc_activity() do {} while(0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |