Hi,
this patch takes into account the new touchscreen API for aximx50.
Pierre
diff -rNu -x CVS -x .project -x .cdtproject -x .settings -x debian kernel26_vanilla/arch/arm/mach-pxa/aximx50/aximx50_ts.c kernel26/arch/arm/mach-pxa/aximx50/aximx50_ts.c
--- kernel26_vanilla/arch/arm/mach-pxa/aximx50/aximx50_ts.c 2007-02-17 21:10:39.834559729 +0100
+++ kernel26/arch/arm/mach-pxa/aximx50/aximx50_ts.c 2007-02-18 09:49:30.717482213 +0100
@@ -14,7 +14,7 @@
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/ads7846.h>
-#include <linux/ads7846ts.h>
+#include <linux/touchscreen-adc.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
@@ -30,6 +30,7 @@
struct ads7846_ssp_platform_data aximx50_ts_ssp_params = {
.port = 1,
.pd_bits = 1,
+ .freq = 100000,
};
static struct platform_device ads7846_ssp = {
.name = "ads7846-ssp",
@@ -38,12 +39,14 @@
}
};
-struct ads7846ts_ssp_platform_data aximx50_ts_params = {
- .irq = IRQ_GPIO(GPIO_NR_X50_PEN_IRQ_N),
- .gpio = GPIO_NR_X50_PEN_IRQ_N,
+struct tsadc_platform_data aximx50_ts_params = {
+ .pen_irq = IRQ_GPIO(GPIO_NR_X50_PEN_IRQ_N),
+ .pen_gpio = GPIO_NR_X50_PEN_IRQ_N,
+ .adc_dev = &ads7846_ssp.dev,
+ .sense = ads7846_sense,
};
static struct platform_device aximx50_ts = {
- .name = "ads7846ts-ssp",
+ .name = "ts-adc-debounce",
.dev = {
.platform_data = &aximx50_ts_params,
}
diff -rNu -x CVS -x .project -x .cdtproject -x .settings -x debian kernel26_vanilla/arch/arm/mach-pxa/aximx50/Kconfig kernel26/arch/arm/mach-pxa/aximx50/Kconfig
--- kernel26_vanilla/arch/arm/mach-pxa/aximx50/Kconfig 2007-02-17 09:49:34.900295513 +0100
+++ kernel26/arch/arm/mach-pxa/aximx50/Kconfig 2007-02-18 09:46:36.578560894 +0100
@@ -1,7 +1,6 @@
menuconfig MACH_X50
bool "Dell Axim X50/X51(v)"
select PXA27x
- select GPIO_KEYS
help
Enable this if you plan to boot the kernel on the Dell Axim X50/X51(v)
series of PDAs. Currently there is only basic support for this
@@ -24,7 +23,8 @@
config X50_TS
tristate "ADS7846 / TSC2046 touchscreen support"
depends on MACH_X50
- select TOUCHSCREEN_ADS7846_SSP
+ select TOUCHSCREEN_ADS7846
+ select ADC_ADS7846_SSP
help
X50/X51(v) touchscreen support.
--
_______________________________________________
Aximx50-port mailing list
[email protected]
https://www.handhelds.org/mailman/listinfo/aximx50-port
