hx4700: fix hx4700 touchscreen pressure values
Subsystems (4)
PATCH 1/1 hx4700: fix hx4700 touchscreen pressure values
hx4700 touchscreen events were being dropped in ads7846_rx() because their pressure values consistently exceeded the platform maximum of 512; a sample of 256 pressure values were in the range 531 to 815. Doubling the platform maximum to 1024 allows hx4700 touchscreen events to pass the test.
---
arch/arm/mach-pxa/hx4700.c renamed from arch/arm/mach-pxa/hx4700.c.orig +1 -1
@@ -604,7 +604,7 @@ static struct platform_device gpio_vbusstatic const struct ads7846_platform_data tsc2046_info = { .model =7846 , .vref_delay_usecs =100 , - .pressure_max =512 , + .pressure_max =1024 , .debounce_max =10 , .debounce_tol =3 , .debounce_rep =1 ,
Eric Miao
AppliedPATCH 1/1 hx4700: fix hx4700 touchscreen pressure values
Quoted 3 lines · Paul Parsons
hx4700 touchscreen events were being dropped in
ads7846_rx()because their pressure values consistently exceeded the platform maximum of 512; a sample of 256 pressure values were in the range 531 to 815. Doubling the platform maximum to 1024 allows hx4700 touchscreen events to pass the test.Signed-off-by Paul Parsons <[email protected]>
Applied to 'fix', thanks.
Quoted 14 lines
---
arch/arm/mach-pxa/hx4700.c 2009-11-14 15:20:14.677951232 +0000 renamed from arch/arm/mach-pxa/hx4700.c.orig ? ?2009-11-14 15:19:59.294682971 +0000 +1
-1@@ -604,7 +604,7 @@ static struct platform_device gpio_vbus ?static const struct ads7846_platform_data tsc2046_info = { ? ? ? ?.model ? ? ? ? ? ?= 7846, ? ? ? ?.vref_delay_usecs = 100, - ? ? ? .pressure_max ? ? = 512, + ? ? ? .pressure_max ? ? = 1024, ? ? ? ?.debounce_max ? ? = 10, ? ? ? ?.debounce_tol ? ? = 3, ? ? ? ?.debounce_rep ? ? = 1,
Hi!
Quoted 3 lines
hx4700 touchscreen events were being dropped in
ads7846_rx()because their pressure values consistently exceeded the platform maximum of 512; a sample of 256 pressure values were in the range 531 to 815. Doubling the platform maximum to 1024 allows hx4700 touchscreen events to pass the test.Signed-off-by Paul Parsons <[email protected]>
Does pressure actually work as expected -- that is not inverted? Because I need this patch on spitz... but it may break your machine...
Binary files linux-rc/drivers/input.ofic/built-in.o and linux-rc/drivers/input/built-in.o differ
drivers/input/touchscreen/ads7846.c renamed from drivers/input.ofic/touchscreen/ads7846.c +14 -17
@@ -29,10 +29,14 @@#include <linux/spi/ads7846.h> #include <asm/irq.h> +#ifndef VERBOSE +#undef dev_dbg +#define dev_dbg (...) do {} while(0) +#endif /* * This code has been heavily tested on a Nokia 770, and lightly -* tested on other ads7846 devices (OSK/Mistral, Lubbock). +* tested on other ads7846 devices (OSK/Mistral, Lubbock, Spitz). * TSC2046 is just newer ads7846 silicon. * Support for ads7843 tested on Atmel at91sam926x-EK. * Support for ads7845 has only been stubbed in.
@@ -43,7 +47,7 @@* have to maintain our own SW IRQ disabled status. This should be * removed as soon as the affected platform's IRQ handling is fixed. * -* app note sbaa036 talks in more detail about accurate sampling... +* App note sbaa036 talks in more detail about accurate sampling... * that ought to help in situations like LCDs inducing noise (which * can also be helped by using synch signals) and more generally. * This driver tries to utilize the measures described in the app
@@ -566,10 +570,8 @@* once more the measurement */ if (packet->tc.ignore || Rt > ts->pressure_max) { -#ifdef VERBOSE -pr_debug ("%s: ignored %d pressure %d\n" , -dev_name (&ts->spi->dev), packet->tc.ignore, Rt); -#endif +dev_dbg (&ts->spi->dev,"ignored %d pressure %d\n" , + packet->tc.ignore, Rt);hrtimer_start (&ts->timer,ktime_set (0 ,TS_POLL_PERIOD ),HRTIMER_MODE_REL );return ;
@@ -584,10 +586,11 @@ Rt =0 ; } -/* NOTE: We can't rely on the pressure to determine the pen down -* state, even this controller has a pressure sensor. The pressure -* value can fluctuate for quite a while after lifting the pen and -* in some cases may not even settle at the expected value. +/* NOTE: We can't rely on the pressure to determine the pen +* down state, not even if this controller has a pressure +* sensor. The pressure value can fluctuate for quite a while +* after lifting the pen and in some cases may not even settle +* at the expected value. * * The only safe way to check for the pen up condition is in the * timer by reading the pen signal state (it's a GPIO _and_ IRQ).
@@ -598,9 +601,7 @@if (!ts->pendown) {input_report_key (input,BTN_TOUCH ,1 ); ts->pendown =1 ; -#ifdef VERBOSE dev_dbg (&ts->spi->dev,"DOWN\n" ); -#endif }if (ts->swap_xy)
@@ -608,12 +609,10 @@input_report_abs (input,ABS_X , x);input_report_abs (input,ABS_Y , y); -input_report_abs (input,ABS_PRESSURE , Rt); +input_report_abs (input,ABS_PRESSURE , ts->pressure_max-Rt);input_sync (input); -#ifdef VERBOSE dev_dbg (&ts->spi->dev,"%4d/%4d/%4d\n" , x, y, Rt); -#endif } hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD),
@@ -723,9 +722,7 @@input_sync (input); ts->pendown =0 ; -#ifdef VERBOSE dev_dbg (&ts->spi->dev,"UP\n" ); -#endif }/* measurement cycle ended */
Binary files linux-rc/drivers/input.ofic/touchscreen/ads7846.o and linux-rc/drivers/input/touchscreen/ads7846.o differ Binary files linux-rc/drivers/input.ofic/touchscreen/built-in.o and linux-rc/drivers/input/touchscreen/built-in.o differ
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html