drivers: touchscreen: tsc2007 and ads7846/tsc2046 improvements (use common touchscreen bindings, pre-calibration, spi fix and provide iio raw values)
Subsystems (2)
cover drivers: touchscreen: tsc2007 and ads7846/tsc2046 improvements (use common touchscreen bindings, pre-calibration, spi fix and provide iio raw values)
This patch series improves the drivers for the tsc2007 and ads7846/tsc2046 touchscreen controllers which are e.g. used by the GTA04, OpenPandora and Pyra devices.
New common bindings have been defined by commit b98abe52fa8e:
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
which also defines a helper function to parse the DT. These new parameters allow to specify the fuzz factors (jitter suppression), inversion of x or y axis and swapping of x and y to achieve inversion and rotation so that the touch coordinate axes match the natural orientation of the display panel.
Another improvement is to better use the min/max ADC values and scale to the screen size as defined by the DT. This allows to coarsely calibrate the touch to match the LCD to which it is glued on so that the touch can quite precisely be operated before any user-space fine-calibration can be (and needs to be) started.
For the adc7846 we fix an issue with the spi module table.
Finally we add an iio interface for the AUX and temperature ADC channels of the tsc2007 and also provide the touch screen raw values. This allows to read an optional ambient light sensor installed on the gta04 board and improves calibration and hardware monitoring.
H. Nikolaus Schaller (7):
drivers:input:tsc2007: add new common binding names, pre-calibration,
flipping and rotation
drivers:input:tsc2007: send pendown and penup only once like
ads7846(+tsc2046) driver does
drivers:input:tsc2007: add iio interface to read external ADC input,
temperature and raw conversion values
DT:omap3+tsc2007: use new common touchscreen bindings drivers:input:ads7846(+tsc2046): add new common binding names,
pre-calibration and flipping
drivers:input:ads7846(+tsc2046): fix spi module table DT:omap3+ads7846: use new common touchscreen bindings
.../devicetree/bindings/input/ads7846.txt | 8 +- .../bindings/input/touchscreen/tsc2007.txt | 20 +- arch/arm/boot/dts/omap3-gta04.dtsi | 18 +- arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- arch/arm/boot/dts/omap3-pandora-common.dtsi | 17 +- .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 2 +- drivers/input/touchscreen/ads7846.c | 83 +++++- drivers/input/touchscreen/tsc2007.c | 286 +++++++++++++++++++-- include/linux/i2c/tsc2007.h | 8 + 9 files changed, 397 insertions(+), 47 deletions(-)
Signature · 1 line
2.5.1
PATCH 1/7 drivers:input:tsc2007: add new common binding names, pre-calibration, flipping and rotation
commit b98abe52fa8e ("Input: add common DT binding for touchscreens") introduced common DT bindings for touchscreens [1] and a helper function to parse the DT.
This has been integrated and interpretation of the inversion (flipping) properties for the x and y axis has been added to accommodate any orientation of the touch in relation to the LCD.
By scaling the min/max ADC values to the screen size it is now possible to pre-calibrate the touch so that is (almost) exactly matches the LCD it is glued onto. This allows to well enough operate the touch before a user space calibration can improve the precision.
calculate_pressure has been renamed to calculate_resistance because that is what it is doing.
[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
--- .../bindings/input/touchscreen/tsc2007.txt | 20 +-- drivers/input/touchscreen/tsc2007.c | 135 +++++++++++++++++---- include/linux/i2c/tsc2007.h | 8 ++ 3 files changed, 135 insertions(+), 28 deletions(-)
Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt +13 -7
@@ -6,6 +6,7 @@ Required properties: - ti,x-plate-ohms: X-plate resistance in ohms. Optional properties: +- generic touch screen properties: see touchscreen binding [2]. - gpios: the interrupt gpio the chip is connected to (trough the penirq pin). The penirq pin goes to low when the panel is touched. (see GPIO binding[1] for more details).
@@ -13,17 +14,20 @@ Optional properties: (see interrupt binding[0]). - interrupts: (gpio) interrupt to which the chip is connected (see interrupt binding[0]). -- ti,max-rt: maximum pressure. -- ti,fuzzx: specifies the absolute input fuzz x value. - If set, it will permit noise in the data up to +- the value given to the fuzz - parameter, that is used to filter noise from the event stream. -- ti,fuzzy: specifies the absolute input fuzz y value. -- ti,fuzzz: specifies the absolute input fuzz z value. +- ti,max-rt: maximum pressure resistance above which samples are ignored + (default: 4095). +- ti,report-resistance: report resistance (no pressure = max_rt) instead + of pressure (no pressure = 0). +- ti,min-x: minimum value reported by X axis ADC (default 0). +- ti,max-x: maximum value reported by X axis ADC (default 4095). +- ti,min-y: minimum value reported by Y axis ADC (default 0). +- ti,max-y: maximum value reported by Y axis ADC (default 4095). - ti,poll-period: how much time to wait (in milliseconds) before reading again the - values from the tsc2007. + values from the tsc2007 (default 1). [0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt [1]: Documentation/devicetree/bindings/gpio/gpio.txt +[2]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt Example: &i2c1 {
@@ -35,6 +39,8 @@ Example: interrupts = <0x0 0x8>; gpios = <&gpio4 0 0>; ti,x-plate-ohms = <180>; + touchscreen-size-x = <640>; + touchscreen-size-y = <480>; }; /* ... */
drivers/input/touchscreen/tsc2007.c +114 -21
226 lines not on this page · raw message
include/linux/i2c/tsc2007.h +8 -0
@@ -6,6 +6,14 @@struct tsc2007_platform_data {u16 model;/* 2007. */ u16 x_plate_ohms;/* must be non-zero value */ +bool swap_xy;/* swap x and y axis */ +bool invert_x; +bool invert_y; +bool report_resistance; +u16 min_x;/* min and max values reported by ADC */ +u16 min_y; +u16 max_x; +u16 max_y;u16 max_rt;/* max. resistance above which samples are ignored */ unsigned long poll_period;/* time (in ms) between samples */ int fuzzx;/* fuzz factor for X, Y and pressure axes */
Signature · 1 line
2.5.1
Rob Herring
maintainerRe: [PATCH 1/7] drivers:input:tsc2007: add new common binding names, pre-calibration, flipping and rotation
Quoted 16 lines · H. Nikolaus Schaller
commit
b98abe52fa8e("Input: add common DT binding for touchscreens") introduced common DT bindings for touchscreens [1] and a helper function to parse the DT.This has been integrated and interpretation of the inversion (flipping) properties for the x and y axis has been added to accommodate any orientation of the touch in relation to the LCD.
By scaling the min/max ADC values to the screen size it is now possible to pre-calibrate the touch so that is (almost) exactly matches the LCD it is glued onto. This allows to well enough operate the touch before a user space calibration can improve the precision.
calculate_pressurehas been renamed tocalculate_resistancebecause that is what it is doing.
Quoted 8 lines
[1]:
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txtSigned-off-by H. Nikolaus Schaller <[email protected]>--- .../bindings/input/touchscreen/tsc2007.txt | 20 +-- drivers/input/touchscreen/tsc2007.c | 135 +++++++++++++++++---- include/linux/i2c/tsc2007.h | 8 ++ 3 files changed, 135 insertions(+), 28 deletions(-)
This one has similar problems with breaking backwards compatibility.
Rob
PATCH 2/7 drivers:input:tsc2007: send pendown and penup only once like ads7846(+tsc2046) driver does
In reply to H. Nikolaus Schallerthis should reduce unnecessary input events.
--- drivers/input/touchscreen/tsc2007.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/input/touchscreen/tsc2007.c +12 -4
@@ -94,6 +94,7 @@ struct tsc2007 {wait_queue_head_t wait;bool stopped; +bool pendown;int (*get_pendown_state)(struct device *);void (*clear_penirq)(void );
@@ -251,7 +252,10 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)dev_dbg (&ts->client->dev,"shaped point(%4d,%4d), pressure (%4u)\n" , tc.x, tc.y, rt); -input_report_key (input,BTN_TOUCH ,1 ); +if (!ts->pendown) { +input_report_key (input,BTN_TOUCH ,1 ); + ts->pendown = true; + }input_report_abs (input,ABS_X , tc.x);input_report_abs (input,ABS_Y , tc.y);input_report_abs (input,ABS_PRESSURE , rt);
@@ -272,9 +276,13 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)dev_dbg (&ts->client->dev,"UP\n" ); -input_report_key (input,BTN_TOUCH ,0 ); -input_report_abs (input,ABS_PRESSURE ,0 ); -input_sync (input); +if (ts->pendown) { +input_report_key (input,BTN_TOUCH ,0 ); +input_report_abs (input,ABS_PRESSURE ,0 ); +input_sync (input); + + ts->pendown = false; + }if (ts->clear_penirq) ts->clear_penirq ();
Signature · 6 lines
2.5.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/7 drivers:input:tsc2007: add iio interface to read external ADC input, temperature and raw conversion values
In reply to H. Nikolaus SchallerThe tsc2007 chip not only has a resistive touch screen controller but also an external AUX adc imput which can be used for an ambient light sensor, battery voltage monitoring or any general purpose.
Additionally it can measure the chip temperature.
This driver provides an iio interface for these adc channels in addition to the raw x, y, z values and the estimated touch screen resistance. This can be used for debugging or special applications.
--- drivers/input/touchscreen/tsc2007.c | 137 +++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-)
drivers/input/touchscreen/tsc2007.c +135 -2
@@ -30,6 +30,9 @@#include <linux/of.h> #include <linux/of_gpio.h> #include <linux/input/touchscreen.h> +#include <linux/iio/iio.h> +#include <linux/iio/machine.h> +#include <linux/iio/driver.h> #define TSC2007_MEASURE_TEMP0 (0x0 << 4)#define TSC2007_MEASURE_AUX (0x2 << 4)
@@ -61,6 +64,16 @@#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X)#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) +#define TSC2007_CHAN_IIO (_chan, _name, _type, _chan_info) \ +{ \ + .datasheet_name = _name, \ + .type = _type, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(_chan_info), \ + .indexed = 1, \ + .channel = _chan, \ +} +struct ts_event {u16 x;u16 y;
@@ -69,9 +82,11 @@ struct ts_event {struct tsc2007 {struct input_dev *input; +struct iio_dev *indio;char phys[32 ];struct i2c_client *client; +struct mutex mlock;u16 model;u16 x_plate_ohms;
@@ -192,7 +207,10 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)while (!ts->stopped &&tsc2007_is_pen_down (ts)) {/* pen is down, continue with the measurement */ + +mutex_lock (&ts->mlock);tsc2007_read_values (ts, &tc); +mutex_unlock (&ts->mlock); rt =tsc2007_calculate_resistance (ts, &tc);
@@ -340,6 +358,86 @@ static void tsc2007_close(struct input_dev *input_dev)tsc2007_stop (ts); } +static const struct iio_chan_spec tsc2007_iio_channel[] = { +TSC2007_CHAN_IIO (0 ,"x" ,IIO_VOLTAGE ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (1 ,"y" ,IIO_VOLTAGE ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (2 ,"z1" ,IIO_VOLTAGE ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (3 ,"z2" ,IIO_VOLTAGE ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (4 ,"adc" ,IIO_VOLTAGE ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (5 ,"rt" ,IIO_VOLTAGE ,IIO_CHAN_INFO_RAW ),/* Ohms? */ +TSC2007_CHAN_IIO (6 ,"pen" ,IIO_PRESSURE ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (7 ,"temp0" ,IIO_TEMP ,IIO_CHAN_INFO_RAW ), +TSC2007_CHAN_IIO (8 ,"temp1" ,IIO_TEMP ,IIO_CHAN_INFO_RAW ), +}; + +static int tsc2007_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val,int *val2,long mask) +{ +struct tsc2007 *tsc =iio_priv (indio_dev); +int adc_chan = chan->channel; +int ret =0 ; + +if (adc_chan >=ARRAY_SIZE (tsc2007_iio_channel)) +return -EINVAL ; + +if (mask !=IIO_CHAN_INFO_RAW ) +return -EINVAL ; + +mutex_lock (&tsc->mlock); + +switch (chan->channel) { +case 0 : + *val =tsc2007_xfer (tsc,READ_X ); +break ; +case 1 : + *val =tsc2007_xfer (tsc,READ_Y ); +break ; +case 2 : + *val =tsc2007_xfer (tsc,READ_Z1 ); +break ; +case 3 : + *val =tsc2007_xfer (tsc,READ_Z2 ); +break ; +case 4 : + *val =tsc2007_xfer (tsc, (ADC_ON_12BIT |TSC2007_MEASURE_AUX )); +break ; +case 5 : { +struct ts_event tc; + + tc.x =tsc2007_xfer (tsc,READ_X ); + tc.z1 =tsc2007_xfer (tsc,READ_Z1 ); + tc.z2 =tsc2007_xfer (tsc,READ_Z2 ); + *val =tsc2007_calculate_resistance (tsc, &tc); +break ; + } +case 6 : + *val =tsc2007_is_pen_down (tsc); +break ; +case 7 : + *val =tsc2007_xfer (tsc, + (ADC_ON_12BIT |TSC2007_MEASURE_TEMP0 )); +break ; +case 8 : + *val =tsc2007_xfer (tsc, + (ADC_ON_12BIT |TSC2007_MEASURE_TEMP1 )); +break ; + } + +/* Prepare for next touch reading - power down ADC, enable PENIRQ */ +tsc2007_xfer (tsc,PWRDOWN ); + +mutex_unlock (&tsc->mlock); + + ret =IIO_VAL_INT ; + +return ret; +} + +static const struct iio_info tsc2007_iio_info = { + .read_raw = tsc2007_read_raw, + .driver_module =THIS_MODULE , +}; +#ifdef CONFIG_OF static int tsc2007_get_pendown_state_gpio (struct device *dev) {
@@ -473,15 +571,20 @@ static int tsc2007_probe(struct i2c_client *client,const struct tsc2007_platform_data *pdata =dev_get_platdata (&client->dev);struct tsc2007 *ts;struct input_dev *input_dev; +struct iio_dev *indio_dev;int err;if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_READ_WORD_DATA ))return -EIO ; - ts =devm_kzalloc (&client->dev,sizeof (struct tsc2007 ),GFP_KERNEL ); -if (!ts) + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*ts)); +if (!indio_dev) { +dev_err (&client->dev,"iio_device_alloc failed\n" );return -ENOMEM ; + } + + ts =iio_priv (indio_dev); input_dev =devm_input_allocate_device (&client->dev);if (!input_dev)
@@ -489,10 +592,26 @@ static int tsc2007_probe(struct i2c_client *client,i2c_set_clientdata (client, ts); + indio_dev->name ="tsc2007" ; + indio_dev->dev.parent = &client->dev; + indio_dev->info = &tsc2007_iio_info; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->channels = tsc2007_iio_channel; + indio_dev->num_channels =ARRAY_SIZE (tsc2007_iio_channel); + + err =iio_device_register (indio_dev); +if (err <0 ) { +dev_err (&client->dev,"iio_device_register() failed: %d\n" , + err); +return err; + } + ts->client = client; ts->irq = client->irq; ts->input = input_dev; + ts->indio = indio_dev;init_waitqueue_head (&ts->wait); +mutex_init (&ts->mlock);snprintf (ts->phys,sizeof (ts->phys),"%s/input0" ,dev_name (&client->dev));
@@ -566,6 +685,19 @@ static int tsc2007_probe(struct i2c_client *client,return 0 ; } +static int tsc2007_remove (struct i2c_client *client) +{ +struct tsc2007 *ts =i2c_get_clientdata (client); +struct input_dev *input_dev = ts->input; +struct iio_dev *indio_dev = ts->indio; + +input_unregister_device (input_dev); + +iio_device_unregister (indio_dev); + +return 0 ; +} +static const struct i2c_device_id tsc2007_idtable[] = { {"tsc2007" ,0 }, { }
@@ -588,6 +720,7 @@ static struct i2c_driver tsc2007_driver = { }, .id_table = tsc2007_idtable, .probe = tsc2007_probe, + .remove = tsc2007_remove, };module_i2c_driver (tsc2007_driver);
Signature · 1 line
2.5.1
kbuild test robot
build botRe: [PATCH 3/7] drivers:input:tsc2007: add iio interface to read external ADC input, temperature and raw conversion values
reproduce:
Hi Nikolaus,
[auto build test ERROR on input/next]
[also build test ERROR on v4.3 next-20151106]
url: https://github.com/0day-ci/linux/commits/H-Nikolaus-Schaller/drivers-touchscreen-tsc2007-and-ads7846-tsc2046-improvements-use-common-touchscreen-bindings-pre-calibration-spi-fix-and-provide-iio-raw-values/20151106-231936 base: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next config: x86_64-randconfig-s2-11062316 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All errors (new ones prefixed by >>):
drivers/built-in.o: In function `tsc2007_remove':
>> tsc2007.c:(.text+0x23a2a6): undefined reference to `iio_device_unregister' drivers/built-in.o: In function `tsc2007_probe': >> tsc2007.c:(.text+0x23a3bf): undefined reference to `devm_iio_device_alloc' >> tsc2007.c:(.text+0x23a436): undefined reference to `iio_device_register'
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 3/7] drivers:input:tsc2007: add iio interface to read external ADC input, temperature and raw conversion values
Am 06.11.2015 um 17:08 schrieb kbuild test robot <[email protected]>:
Quoted 12 lines
Hi Nikolaus,
[auto build test ERROR on input/next]
[also build test ERROR on v4.3 next-20151106]url: https://github.com/0day-ci/linux/commits/H-Nikolaus-Schaller/drivers-touchscreen-tsc2007-and-ads7846-tsc2046-improvements-use-common-touchscreen-bindings-pre-calibration-spi-fix-and-provide-iio-raw-values/20151106-231936 base: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next config: x86_64-randconfig-s2-11062316 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=x86_64
Quoted 7 lines
All errors (new ones prefixed by >>):
drivers/built-in.o: In function `tsc2007_remove':Quoted 1 line
Quoted 1 line
tsc2007.c:(.text+0x23a2a6): undefined reference to `iio_device_unregister'
drivers/built-in.o: In function `tsc2007_probe':Quoted 2 lines
Quoted 2 lines
tsc2007.c:(.text+0x23a3bf): undefined reference to
devm_iio_device_alloc' tsc2007.c:(.text+0x23a436): undefined reference toiio_device_register'
Ok, that is a missing dependency on CONFIG_IIO.
Has been noted for V2.
kbuild test robot
build botRe: [PATCH 3/7] drivers:input:tsc2007: add iio interface to read external ADC input, temperature and raw conversion values
In reply to H. Nikolaus Schallerreproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree…
Hi Nikolaus,
[auto build test ERROR on input/next]
[also build test ERROR on v4.3 next-20151106]
url: https://github.com/0day-ci/linux/commits/H-Nikolaus-Schaller/drivers-touchscreen-tsc2007-and-ads7846-tsc2046-improvements-use-common-touchscreen-bindings-pre-calibration-spi-fix-and-provide-iio-raw-values/20151106-231936 base: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next config: arm-imx_v6_v7_defconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
drivers/built-in.o: In function `tsc2007_remove':
>> :(.text+0x1cd9c8): undefined reference to `iio_device_unregister' drivers/built-in.o: In function `tsc2007_probe': >> :(.text+0x1ce1a0): undefined reference to `devm_iio_device_alloc' >> :(.text+0x1ce1f4): undefined reference to `iio_device_register'
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH 4/7 DT:omap3+tsc2007: use new common touchscreen bindings
In reply to H. Nikolaus SchallerTested on: GTA04A4 (Letux2804), Letux3704, Letux7004
--- arch/arm/boot/dts/omap3-gta04.dtsi | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +16 -2
@@ -357,10 +357,24 @@ tsc2007@48 { compatible = "ti,tsc2007"; reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&penirq_pins>; interrupt-parent = <&gpio6>; interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */ - gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; - ti,x-plate-ohms = <600>; + gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* GPIO_160 */ + touchscreen-size-x = <480>; + touchscreen-size-y = <640>; + touchscreen-max-pressure = <1000>; + touchscreen-fuzz-x = <2>; + touchscreen-fuzz-y = <2>; + touchscreen-fuzz-pressure = <10>; + touchscreen-inverted-y; + ti,min-x = <0x100>; + ti,max-x = <0xf00>; + ti,min-y = <0x100>; + ti,max-y = <0xf00>; + ti,max-rt = <4096>; + ti,x-plate-ohms = <550>; }; };
Signature · 1 line
2.5.1
PATCH 5/7 drivers:input:ads7846(+tsc2046): add new common binding names, pre-calibration and flipping
In reply to H. Nikolaus Schallercommit b98abe52fa8e ("Input: add common DT binding for touchscreens") introduced common DT bindings for touchscreens [1] and a helper function to parse the DT.
This has been integrated and interpretation of the inversion (flipping) properties for the x and y axis has been added to accommodate any orientation of the touch in relation to the LCD.
By scaling the min/max ADC values to the screen size it is now possible to pre-calibrate the touch so that is (almost) exactly matches the LCD it is glued onto. This allows to well enough operate the touch before a user space calibration can improve the precision.
[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
--- .../devicetree/bindings/input/ads7846.txt | 8 ++- drivers/input/touchscreen/ads7846.c | 72 ++++++++++++++++++++-- 2 files changed, 74 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/input/ads7846.txt +7 -1
@@ -26,12 +26,17 @@ Additional required properties: Optional properties: +You can optionally specify any of the touchscreen parameters described in + + Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt + +This allows to scale, invert or swap coordinates and define the fuzz factors. + ti,vref-delay-usecs vref supply delay in usecs, 0 for external vref (u16). ti,vref-mv The VREF voltage, in millivolts (u16). ti,keep-vref-on set to keep vref on for differential measurements as well - ti,swap-xy swap x and y axis ti,settle-delay-usec Settling time of the analog signals; a function of Vcc and the capacitance on the X/Y drivers. If set to non-zero,
@@ -79,6 +84,7 @@ Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC:: pendown-gpio = <&gpio1 8 0>; vcc-supply = <®_vcc3>; + touchscreen-swapped-x-y; ti,x-min = /bits/ 16 <0>; ti,x-max = /bits/ 16 <8000>; ti,y-min = /bits/ 16 <0>;
drivers/input/touchscreen/ads7846.c +67 -5
114 lines not on this page · raw message
Signature · 1 line
2.5.1
Rob Herring
maintainerRe: [PATCH 5/7] drivers:input:ads7846(+tsc2046): add new common binding names, pre-calibration and flipping
Quoted 13 lines · H. Nikolaus Schaller
commit
b98abe52fa8e("Input: add common DT binding for touchscreens") introduced common DT bindings for touchscreens [1] and a helper function to parse the DT.This has been integrated and interpretation of the inversion (flipping) properties for the x and y axis has been added to accommodate any orientation of the touch in relation to the LCD.
By scaling the min/max ADC values to the screen size it is now possible to pre-calibrate the touch so that is (almost) exactly matches the LCD it is glued onto. This allows to well enough operate the touch before a user space calibration can improve the precision.
Quoted 5 lines
[1]:
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txtSigned-off-by H. Nikolaus Schaller <[email protected]>--- .../devicetree/bindings/input/ads7846.txt | 8 ++-
The binding change looks okay, but...
drivers/input/touchscreen/ads7846.c static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev) · line 1262
Quoted 6 lines
drivers/input/touchscreen/ads7846.c +1
-1@@ -1213,7 +1259,7 @@ static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev)of_property_read_u16 (node,"ti,vref-mv" , &pdata->vref_mv); pdata->keep_vref_on =of_property_read_bool (node,"ti,keep-vref-on" ); - pdata->swap_xy =of_property_read_bool (node,"ti,swap-xy" ); + pdata->swap_xy =of_property_read_bool (node,"touchscreen-swapped-x-y" );
This will break with old dtb's. The driver should look for either property.
Rob
Re: [PATCH 5/7] drivers:input:ads7846(+tsc2046): add new common binding names, pre-calibration and flipping
Am 09.11.2015 um 18:31 schrieb Rob Herring <[email protected]>:
Quoted 22 lines · H. Nikolaus Schaller
Quoted 13 lines
commit
b98abe52fa8e("Input: add common DT binding for touchscreens") introduced common DT bindings for touchscreens [1] and a helper function to parse the DT.This has been integrated and interpretation of the inversion (flipping) properties for the x and y axis has been added to accommodate any orientation of the touch in relation to the LCD.
By scaling the min/max ADC values to the screen size it is now possible to pre-calibrate the touch so that is (almost) exactly matches the LCD it is glued onto. This allows to well enough operate the touch before a user space calibration can improve the precision.
Quoted 5 lines
[1]:
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txtSigned-off-by H. Nikolaus Schaller <[email protected]>---
.../devicetree/bindings/input/ads7846.txt| 8 ++-The binding change looks okay, but...
Quoted 8 lines
drivers/input/touchscreen/ads7846.c static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev) · line 1262
Quoted 6 lines
drivers/input/touchscreen/ads7846.c +1
-1@@ -1213,7 +1259,7 @@ static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev)of_property_read_u16 (node,"ti,vref-mv" , &pdata->vref_mv); pdata->keep_vref_on =of_property_read_bool (node,"ti,keep-vref-on" ); - pdata->swap_xy =of_property_read_bool (node,"ti,swap-xy" ); + pdata->swap_xy =of_property_read_bool (node,"touchscreen-swapped-x-y" );This will break with old dtb's.
We have a patch for all boards in tree (external dtbs must be modified by their maintainers).
Quoted 2 lines
The driver should look for either
property.
It is easy to recognize either one.
Noted for V2.
BR and thanks,
Nikolaus
PATCH 6/7 drivers:input:ads7846(+tsc2046): fix spi module table
In reply to H. Nikolaus SchallerFix module table so that the driver is loaded if compiled as module and requested by DT.
--- drivers/input/touchscreen/ads7846.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/input/touchscreen/ads7846.c +11 -0
@@ -1559,6 +1559,17 @@ static int ads7846_remove(struct spi_device *spi)return 0 ; } +static const struct spi_device_id ads7846_idtable[] = { + {"tsc2046" ,0 }, + {"ads7843" ,0 }, + {"ads7845" ,0 }, + {"ads7846" ,0 }, + {"ads7873" ,0 }, + { } +}; + +MODULE_DEVICE_TABLE (spi, ads7846_idtable); +static struct spi_driver ads7846_driver = { .driver = { .name ="ads7846" ,
Signature · 1 line
2.5.1
PATCH 7/7 DT:omap3+ads7846: use new common touchscreen bindings
In reply to H. Nikolaus SchallerThe standard touch screen bindings [1] replace the private ti,swap-xy with touchscreen-swaped-x-y. And for the Openpandora we use touchscreen-size etc. to match the LCD screen size.
[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
--- arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- arch/arm/boot/dts/omap3-pandora-common.dtsi | 17 +++++++++++++---- arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3-lilly-a83x.dtsi +1 -1
@@ -325,7 +325,7 @@ ti,y-max = /bits/ 16 <3600>; ti,x-plate-ohms = /bits/ 16 <80>; ti,pressure-max = /bits/ 16 <255>; - ti,swap-xy; + touchscreen-swapped-x-y; linux,wakeup; };
arch/arm/boot/dts/omap3-pandora-common.dtsi +13 -4
@@ -696,10 +696,19 @@ pendown-gpio = <&gpio3 30 0>; vcc-supply = <&vaux4>; - ti,x-min = /bits/ 16 <0>; - ti,x-max = /bits/ 16 <8000>; - ti,y-min = /bits/ 16 <0>; - ti,y-max = /bits/ 16 <4800>; + touchscreen-size-x = <800>; + touchscreen-size-y = <480>; + touchscreen-max-pressure = <1000>; + touchscreen-fuzz-x = <16>; + touchscreen-fuzz-y = <16>; + touchscreen-fuzz-pressure = <10>; + touchscreen-inverted-x; + touchscreen-inverted-y; + + ti,x-min = /bits/ 16 <160>; + ti,x-max = /bits/ 16 <3900>; + ti,y-min = /bits/ 16 <220>; + ti,y-max = /bits/ 16 <3750>; ti,x-plate-ohms = /bits/ 16 <40>; ti,pressure-max = /bits/ 16 <255>;
arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi +1 -1
@@ -65,7 +65,7 @@ ti,y-max = /bits/ 16 <4800>; ti,x-plate-ohms = /bits/ 16 <40>; ti,pressure-max = /bits/ 16 <255>; - ti,swap-xy; + touchscreen-swapped-x-y; linux,wakeup; }; };
Signature · 1 line
2.5.1