Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [1125] linux4palm/linux/trunk
|
From: <sle...@us...> - 2007-07-10 10:24:18
|
Revision: 1125
http://svn.sourceforge.net/hackndev/?rev=1125&view=rev
Author: sleep_walker
Date: 2007-07-10 03:24:09 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
palmtt3: fixed tsc2101 and sound dependencies, GPIO header update
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c
linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_bt.c
linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig
linux4palm/linux/trunk/drivers/mfd/Kconfig
linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h
linux4palm/linux/trunk/sound/arm/Kconfig
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c 2007-07-09 22:35:05 UTC (rev 1124)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c 2007-07-10 10:24:09 UTC (rev 1125)
@@ -396,6 +396,7 @@
PWER |= PWER_GPIO11; /* memo/todo/center */
PWER |= PWER_GPIO12; /* HotSync button on cradle */
PWER |= PWER_GPIO14; /* power button */
+ PWER |= PWER_GPIO15; /* Bluetooth wakeup? */
PFER = PWER_GPIO0 | PWER_GPIO1 | PWER_GPIO11 | PWER_GPIO14;
PEDR = PWER_GPIO0 | PWER_GPIO1;
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_bt.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_bt.c 2007-07-09 22:35:05 UTC (rev 1124)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_bt.c 2007-07-10 10:24:09 UTC (rev 1125)
@@ -18,10 +18,14 @@
void bcm2035_bt_reset(int on)
{
printk(KERN_NOTICE "Switch BT reset %d\n", on);
- if (on)
- SET_GPIO(GPIO_NR_PALMTT3_RESET, 1);
- else
- SET_GPIO(GPIO_NR_PALMTT3_RESET, 0 );
+ if (on) {
+ /* FIXME: it's just template, GPIOs are not the right ones */
+ pxa_gpio_mode(GPIO83_NSSP_TX);
+ pxa_gpio_mode(GPIO84_NSSP_TX);
+ }
+ else {
+
+ }
}
EXPORT_SYMBOL(bcm2035_bt_reset);
Modified: linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig 2007-07-09 22:35:05 UTC (rev 1124)
+++ linux4palm/linux/trunk/drivers/input/touchscreen/Kconfig 2007-07-10 10:24:09 UTC (rev 1125)
@@ -56,9 +56,8 @@
config TOUCHSCREEN_TSC2101
tristate "TI TSC2101 touchscreen input driver"
- depends on (MACH_HX2750 || MACH_T3XSCALE) && INPUT && INPUT_TOUCHSCREEN
- select SOC_TSC2101
- default y
+ depends on (MACH_HX2750 || MACH_T3XSCALE) && INPUT_TOUCHSCREEN
+ default y
help
Say Y here to enable the driver for the touchscreen on the
iPAQ hx2750 series of PDAs or Palm Tungsten|T3.
Modified: linux4palm/linux/trunk/drivers/mfd/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/mfd/Kconfig 2007-07-09 22:35:05 UTC (rev 1124)
+++ linux4palm/linux/trunk/drivers/mfd/Kconfig 2007-07-10 10:24:09 UTC (rev 1125)
@@ -104,6 +104,10 @@
config SOC_TSC2101
tristate "Support for TI TSC2101 Touchscreen and Audio Codec"
+ depends TOUCHSCREEN_TSC2101 && SOUND && SND && SND_PXA2xx_I2SOUND
+# depends TOUCHSCREEN_TSC2101
+# select SND_PXA2xx_I2SOUND
+ default m
help
Support for TI TSC2101 Touchscreen and Audio Codec
Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h 2007-07-09 22:35:05 UTC (rev 1124)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h 2007-07-10 10:24:09 UTC (rev 1125)
@@ -28,19 +28,15 @@
#define PALMTT3_GPIO_PENDOWN (37)
#define PALMTT3_IRQ_GPIO_PENDOWN IRQ_GPIO(PALMTT3_GPIO_PENDOWN)
-#define GPIO_NR_PALMTT3_ICP_RXD 46 // Infrared receive pin
-#define GPIO_NR_PALMTT3_ICP_TXD 47 // Infrared transmit pin
#define GPIO_NR_PALMTT3_IR_DISABLE 36
-#define GPIO_NR_PALMTT3_ICP_RXD_MD (GPIO_NR_PALMTT3_ICP_RXD | GPIO_ALT_FN_1_IN)
-#define GPIO_NR_PALMTT3_ICP_TXD_MD (GPIO_NR_PALMTT3_ICP_TXD | GPIO_ALT_FN_2_OUT)
#define GPIO_NR_PALMTT3_USB_POWER 53
#define GPIO_NR_PALMTT3_PUC_USB_POWER 85
#define GPIO_NR_PALMTT3_USB_DETECT 9
#define GPIO_NR_PALMTT3_TPS65010_BT_POWER 4
-#define GPIO_NR_PALMTT3_RESET 84
+#define GPIO_NR_PALMTT3_BT_WAKEUP 15
#define GET_GPIO(gpio) (GPLR(gpio) & GPIO_bit(gpio))
Modified: linux4palm/linux/trunk/sound/arm/Kconfig
===================================================================
--- linux4palm/linux/trunk/sound/arm/Kconfig 2007-07-09 22:35:05 UTC (rev 1124)
+++ linux4palm/linux/trunk/sound/arm/Kconfig 2007-07-10 10:24:09 UTC (rev 1125)
@@ -108,6 +108,7 @@
config SND_PXA2xx_I2SOUND
tristate "PXA2 I2Sound support"
+ depends on SND
select SND_PCM
config SND_PXA2XX_PCM
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
