drivers: touchscreen: tsc2007 and ads7846/tsc2046 improvements (use common touchscreen bindings, pre-calibration, spi fix and provide iio raw values)
Subsystems (4)
v6 cover drivers: touchscreen: tsc2007 and ads7846/tsc2046 improvements (use common touchscreen bindings, pre-calibration, spi fix and provide iio raw values)
Changes V6:
* iio patch (no changes elsewhere)
- tsc2007_iio: fix a missing return 0 for non-iio case (found by kbuid test robot)
- tsc2007_core: group error return paths so that tsc2007_iio_unconfigure is called at only one place
- tsc2007_iio: fix copyright (this file is 100% original work)
2016-10-25 21:26:46: Changes V5:
* ads7846: remove an empty line (suggested by Andrew F. Davis <[email protected]>)
* ads7846: remove MODULE_ALIAS for SPI (suggested by Andrew F. Davis <[email protected]>)
* tsc2007: fix a bug from swapping patch 3/n and patch 4/n (found by kbuid test robot)
* refactored tsc2007 into tsc2007_core and tsc2007_iio (asked for by Jonathan Cameron <[email protected]>)
2016-10-17 16:00:02: Changes V4:
* fix a merge/squash issue resulting in a non-bisectable patch set (suggested by kbuid test robot)
* remove some unnecessary #include (suggested by Jonathan Cameron <[email protected]>)
* make the iio extension depend on CONFIG_IIO rather than selecting it (suggested by Jonathan Cameron <[email protected]>)
* swapped patch 3/n and patch 4/n to remove internal dependency
2016-09-23 14:41:23: Changes V3:
* fix an issue with swapping
* remove hard clipping to min/max rectangle - some systems expect to handle negative coordinates
* make use of commit ed7c9870c9bc ("Input: of_touchscreen - add support for inverted / swapped axes")
2015-11-13 21:36:07: Changes V2:
* add a patch to make drivers still recognise the old "ti,swap-xy" property (suggested by Rob Herring)
2015-11-06 16:14:53: 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 ("Input: add common DT binding for touchscreens"):
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 (8):
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: check for presence and power down tsc2007
during probe
drivers:input:tsc2007: add iio interface to read external ADC input
and temperature
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 | 9 +-
.../bindings/input/touchscreen/tsc2007.txt | 20 +-
arch/arm/boot/dts/omap3-gta04.dtsi | 25 ++-
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 | 3 +-
drivers/input/touchscreen/Makefile | 2 +
drivers/input/touchscreen/ads7846.c | 71 +++++-
drivers/input/touchscreen/tsc2007.h | 129 +++++++++++
.../touchscreen/{tsc2007.c => tsc2007_core.c} | 244 ++++++++++++---------
drivers/input/touchscreen/tsc2007_iio.c | 151 +++++++++++++
include/linux/i2c/tsc2007.h | 8 +
12 files changed, 551 insertions(+), 130 deletions(-)
create mode 100644 drivers/input/touchscreen/tsc2007.h
rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (70%)
create mode 100644 drivers/input/touchscreen/tsc2007_iio.cSignature · 1 line
2.7.3
PATCH v6 1/8 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.
commit ed7c9870c9bc ("Input: of_touchscreen - add support for inverted / swapped axes") added another helper for parsing axis inversion and swapping
and applying them to x and y coordinates.
Both helpers have been integrated to accommodate any orientation of the touch panel in relation to the LCD.
A new feature is to introduce scaling the min/max ADC values to the screen size.
This makes it possible to pre-calibrate the touch so that is (almost) exactly matches the LCD pixel coordinates it is glued onto. This allows to well enough operate the touch before a user space calibration step can improve the precision.
Finally, 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 | 120 +++++++++++++++++---- include/linux/i2c/tsc2007.h | 8 ++ 3 files changed, 118 insertions(+), 30 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 +97 -23
212 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.7.3
PATCH v6 2/8 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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/input/touchscreen/tsc2007.c +13 -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 );
@@ -227,7 +228,11 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) sx, sy, rt);/* report event */ -input_report_key (input,BTN_TOUCH ,1 ); +if (!ts->pendown) { +input_report_key (input,BTN_TOUCH ,1 ); + ts->pendown = true; + } + touchscreen_report_pos(ts->input, &ts->prop, (unsigned int) sx, (unsigned int) sy,
@@ -250,9 +255,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.7.3 -- 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
Dmitry Torokhov
maintainerRe: [PATCH v6 2/8] drivers:input:tsc2007: send pendown and penup only once like ads7846(+tsc2046) driver does
Quoted 1 line · H. Nikolaus Schaller
this should reduce unnecessary input events.
The duplicates will be filtered out by the input core anyway. I like to keep the drivers simple.
Thanks.
Quoted 51 lines
Signed-off-by H. Nikolaus Schaller <[email protected]>--- drivers/input/touchscreen/tsc2007.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)drivers/input/touchscreen/tsc2007.c +13
-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 );@@ -227,7 +228,11 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) sx, sy, rt);/* report event */ -input_report_key (input,BTN_TOUCH ,1 ); +if (!ts->pendown) { +input_report_key (input,BTN_TOUCH ,1 ); + ts->pendown = true; + } + touchscreen_report_pos(ts->input, &ts->prop, (unsigned int) sx, (unsigned int) sy,@@ -250,9 +255,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 · 1 line
2.7.3
Signature · 1 line
Dmitry
Re: [PATCH v6 2/8] drivers:input:tsc2007: send pendown and penup only once like ads7846(+tsc2046) driver does
Hi Dmitry,
Quoted 7 lines
Am 19.11.2016 um 19:12 schrieb Dmitry Torokhov <[email protected]>:
Quoted 1 line · H. Nikolaus Schaller
this should reduce unnecessary input events.
The duplicates will be filtered out by the input core anyway. I like to keep the drivers simple.
Well, the idea was copied from the ads7846 driver. But there it is used to provide a /sys status.
I have tried to find the code location that really makes sure that the BTN_TOUCH is reported only once, but didn't find it.
My thought is that having it here makes me more sure that it is really filtered because it does not to rely on functions deeply hidden in the input core.
On the other hand we apparently also rely on ABS_X etc. to be filtered by core.
In any case I have tested with and without and it does not make a difference. Maybe it was needed when we started to work on this driver some years ago before posting the patches here.
So I drop it from v8 which will come in some minutes.
Quoted 2 lines
Thanks.
BR and thanks,
Nikolaus
Re: [PATCH v6 2/8] drivers:input:tsc2007: send pendown and penup only once like ads7846(+tsc2046) driver does
In reply to Dmitry TorokhovHi Dmitry,
Quoted 7 lines
Am 19.11.2016 um 19:12 schrieb Dmitry Torokhov <[email protected]>:
Quoted 1 line · H. Nikolaus Schaller
this should reduce unnecessary input events.
The duplicates will be filtered out by the input core anyway. I like to keep the drivers simple.
Well, the idea was copied from the ads7846 driver. But there it is used to provide a /sys status.
I have tried to find the code location that really makes sure that the BTN_TOUCH is reported only once, but didn't find it.
My thought is that having it here makes me more sure that it is really filtered because it does not to rely on functions deeply hidden in the input core.
On the other hand we apparently also rely on ABS_X etc. to be filtered by core.
In any case I have tested with and without and it does not make a difference. Maybe it was needed when we started to work on this driver some years ago before posting the patches here.
So I drop it from v8 which will come in some minutes.
Quoted 2 lines
Thanks.
BR and thanks,
Nikolaus
PATCH v6 3/8 drivers:input:tsc2007: check for presence and power down tsc2007 during probe
In reply to H. Nikolaus Schaller1. check if chip is really present and don't succeed if it isn't.
2. if it succeeds, power down the chip until accessed
--- drivers/input/touchscreen/tsc2007.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/input/touchscreen/tsc2007.c +8 -0
@@ -538,6 +538,14 @@ static int tsc2007_probe(struct i2c_client *client,tsc2007_stop (ts); +/* power down the chip (TSC2007_SETUP does not ACK on I2C) */ + err =tsc2007_xfer (ts,PWRDOWN ); +if (err <0 ) { +dev_err (&client->dev, +"Failed to setup chip: %d\n" , err); +return err;/* usually, chip does not respond */ + } + err =input_register_device (input_dev);if (err) { dev_err(&client->dev,
Signature · 1 line
2.7.3
PATCH v6 4/8 drivers:input:tsc2007: add iio interface to read external ADC input and temperature
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 extension provides an iio interface for these adc channels.
Since it is not wasting much resources and is very straightforward, we simply provide all other adc channels as optional iio interfaces as weel. This can be used for debugging or special applications.
This patch also splits the tsc2007 driver in several source files:tsc2007.h -- constants, structs and stubs tsc2007_core.c -- functional parts of the original driver tsc2007_iio.c -- the optional iio stuff
Makefile magic allows to conditionally link the iio stuff if CONFIG_IIO=y in a way that it works with CONFIG_TOUCHSCREEN_TSC2007=m.
---
drivers/input/touchscreen/Makefile | 2 +
drivers/input/touchscreen/tsc2007.h | 129 ++++++++++++++++++
.../touchscreen/{tsc2007.c => tsc2007_core.c} | 127 ++++++-----------
drivers/input/touchscreen/tsc2007_iio.c | 151 +++++++++++++++++++++
4 files changed, 320 insertions(+), 89 deletions(-)
create mode 100644 drivers/input/touchscreen/tsc2007.h
rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (84%)
create mode 100644 drivers/input/touchscreen/tsc2007_iio.cdrivers/input/touchscreen/Makefile +2 -0
@@ -80,6 +80,8 @@ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o obj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE) += tsc200x-core.o obj-$(CONFIG_TOUCHSCREEN_TSC2004) += tsc2004.o obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o +tsc2007-y := tsc2007_core.o +tsc2007-$(CONFIG_IIO) += tsc2007_iio.o obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
drivers/input/touchscreen/tsc2007.h new file +129 -0
129 lines not on this page · raw message
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +38 -89
224 lines not on this page · raw message
drivers/input/touchscreen/tsc2007_iio.c new file +151 -0
151 lines not on this page · raw message
Signature · 1 line
2.7.3
Jonathan Cameron
maintainerRe: [PATCH v6 4/8] drivers:input:tsc2007: add iio interface to read external ADC input and temperature
Quoted 17 lines · H. Nikolaus Schaller
The 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 extension provides an iio interface for these adc channels.
Since it is not wasting much resources and is very straightforward, we simply provide all other adc channels as optional iio interfaces as weel. This can be used for debugging or special applications.
This patch also splits the tsc2007 driver in several source files:
tsc2007.h-- constants, structs and stubstsc2007_core.c-- functional parts of the original drivertsc2007_iio.c-- the optional iio stuff
Quoted 5 lines
Makefilemagic allows to conditionally link the iio stuff ifCONFIG_IIO=yin a way that it works withCONFIG_TOUCHSCREEN_TSC2007=m.Signed-off-by H. Nikolaus Schaller <[email protected]>
oops. Missed this newer version. Replied to V5. Most of the comments are still relevant I think.
J
Quoted 561 lines
--- drivers/input/touchscreen/Makefile | 2 + drivers/input/touchscreen/tsc2007.h | 129 ++++++++++++++++++ .../touchscreen/{tsc2007.c => tsc2007_core.c} | 127 ++++++----------- drivers/input/touchscreen/tsc2007_iio.c | 151 +++++++++++++++++++++ 4 files changed, 320 insertions(+), 89 deletions(-) create mode 100644 drivers/input/touchscreen/tsc2007.h rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (84%) create mode 100644 drivers/input/touchscreen/tsc2007_iio.cdrivers/input/touchscreen/Makefile +2
-0@@ -80,6 +80,8 @@ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o obj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE) += tsc200x-core.o obj-$(CONFIG_TOUCHSCREEN_TSC2004) += tsc2004.o obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o +tsc2007-y := tsc2007_core.o +tsc2007-$(CONFIG_IIO) += tsc2007_iio.o obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.odrivers/input/touchscreen/tsc2007.h new file +129
-0@@ -0,0 +1,129 @@ +/* +* drivers/input/touchscreen/tsc2007.h +* +* Copyright (c) 2008 MtekVision Co., Ltd. +* Kwangwoo Lee <[email protected]> +* +* Using code from: +* - ads7846.c +* Copyright (c) 2005 David Brownell +* Copyright (c) 2006 Nokia Corporation +* - corgi_ts.c +* Copyright (C) 2004-2005 Richard Purdie +* - omap_ts.[hc], ads7846.h, ts_osk.c +* Copyright (C) 2002 MontaVista Software +* Copyright (C) 2004 Texas Instruments +* Copyright (C) 2005 Dirk Behme +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/i2c/tsc2007.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/input/touchscreen.h> + +#define TSC2007_MEASURE_TEMP0 (0x0 << 4) +#define TSC2007_MEASURE_AUX (0x2 << 4) +#define TSC2007_MEASURE_TEMP1 (0x4 << 4) +#define TSC2007_ACTIVATE_XN (0x8 << 4) +#define TSC2007_ACTIVATE_YN (0x9 << 4) +#define TSC2007_ACTIVATE_YP_XN (0xa << 4) +#define TSC2007_SETUP (0xb << 4) +#define TSC2007_MEASURE_X (0xc << 4) +#define TSC2007_MEASURE_Y (0xd << 4) +#define TSC2007_MEASURE_Z1 (0xe << 4) +#define TSC2007_MEASURE_Z2 (0xf << 4) + +#define TSC2007_POWER_OFF_IRQ_EN (0x0 << 2) +#define TSC2007_ADC_ON_IRQ_DIS0 (0x1 << 2) +#define TSC2007_ADC_OFF_IRQ_EN (0x2 << 2) +#define TSC2007_ADC_ON_IRQ_DIS1 (0x3 << 2) + +#define TSC2007_12BIT (0x0 << 1) +#define TSC2007_8BIT (0x1 << 1) + +#define MAX_12BIT ((1 << 12) - 1) + +#define ADC_ON_12BIT (TSC2007_12BIT | TSC2007_ADC_ON_IRQ_DIS0) + +#define READ_Y (ADC_ON_12BIT | TSC2007_MEASURE_Y) +#define READ_Z1 (ADC_ON_12BIT | TSC2007_MEASURE_Z1) +#define READ_Z2 (ADC_ON_12BIT | TSC2007_MEASURE_Z2) +#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X) +#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) + +struct ts_event { +u16 x; +u16 y; +u16 z1, z2; +}; + +struct tsc2007 { +struct input_dev *input; +char phys[32 ]; + +struct i2c_client *client; + +u16 model; +u16 x_plate_ohms; + +struct touchscreen_properties prop; + +bool report_resistance; +u16 min_x; +u16 min_y; +u16 max_x; +u16 max_y; +u16 max_rt; +unsigned long poll_period;/* in jiffies */ +int fuzzx; +int fuzzy; +int fuzzz; + +unsigned int gpio; +int irq; + +wait_queue_head_t wait; +bool stopped; +bool pendown; + +int (*get_pendown_state)(struct device *); +void (*clear_penirq)(void ); + +struct mutex mlock; +#ifdef CONFIG_IIO +void *private; +#endif +}; + +int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd); +u32 tsc2007_calculate_resistance (struct tsc2007 *tsc, +struct ts_event *tc); +bool tsc2007_is_pen_down (struct tsc2007 *ts); + +#ifdef CONFIG_IIO + +/* defined in tsc2007_iio.c */ +int tsc2007_iio_configure (struct tsc2007 *ts); +void tsc2007_iio_unconfigure (struct tsc2007 *ts); + +#else /* CONFIG_IIO */ + +static inline int tsc2007_iio_configure (struct tsc2007 *ts) +{ +return 0 ; +} +static inline void tsc2007_iio_unconfigure (struct tsc2007 *ts) +{ +} + +#endif /* CONFIG_IIO */ drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +38
-89@@ -20,87 +20,9 @@* published by the Free Software Foundation. */ -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/input.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/i2c/tsc2007.h> -#include <linux/of_device.h> -#include <linux/of.h> -#include <linux/of_gpio.h> -#include <linux/input/touchscreen.h> - -#define TSC2007_MEASURE_TEMP0 (0x0 << 4) -#define TSC2007_MEASURE_AUX (0x2 << 4) -#define TSC2007_MEASURE_TEMP1 (0x4 << 4) -#define TSC2007_ACTIVATE_XN (0x8 << 4) -#define TSC2007_ACTIVATE_YN (0x9 << 4) -#define TSC2007_ACTIVATE_YP_XN (0xa << 4) -#define TSC2007_SETUP (0xb << 4) -#define TSC2007_MEASURE_X (0xc << 4) -#define TSC2007_MEASURE_Y (0xd << 4) -#define TSC2007_MEASURE_Z1 (0xe << 4) -#define TSC2007_MEASURE_Z2 (0xf << 4) - -#define TSC2007_POWER_OFF_IRQ_EN (0x0 << 2) -#define TSC2007_ADC_ON_IRQ_DIS0 (0x1 << 2) -#define TSC2007_ADC_OFF_IRQ_EN (0x2 << 2) -#define TSC2007_ADC_ON_IRQ_DIS1 (0x3 << 2) - -#define TSC2007_12BIT (0x0 << 1) -#define TSC2007_8BIT (0x1 << 1) - -#define MAX_12BIT ((1 << 12) - 1) - -#define ADC_ON_12BIT (TSC2007_12BIT | TSC2007_ADC_ON_IRQ_DIS0) - -#define READ_Y (ADC_ON_12BIT | TSC2007_MEASURE_Y) -#define READ_Z1 (ADC_ON_12BIT | TSC2007_MEASURE_Z1) -#define READ_Z2 (ADC_ON_12BIT | TSC2007_MEASURE_Z2) -#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X) -#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) - -struct ts_event { -u16 x; -u16 y; -u16 z1, z2; -}; - -struct tsc2007 { -struct input_dev *input; -char phys[32 ]; - -struct i2c_client *client; - -u16 model; -u16 x_plate_ohms; - -struct touchscreen_properties prop; - -bool report_resistance; -u16 min_x; -u16 min_y; -u16 max_x; -u16 max_y; -u16 max_rt; -unsigned long poll_period;/* in jiffies */ -int fuzzx; -int fuzzy; -int fuzzz; +#include "tsc2007.h" -unsigned gpio; -int irq; - -wait_queue_head_t wait; -bool stopped; -bool pendown; - -int (*get_pendown_state)(struct device *); -void (*clear_penirq)(void ); -}; - -static inline int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) +int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) {s32 data;u16 val;@@ -121,6 +43,7 @@ static inline int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd)return val; } +EXPORT_SYMBOL (tsc2007_xfer);static void tsc2007_read_values (struct tsc2007 *tsc,struct ts_event *tc) {@@ -138,7 +61,7 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc)tsc2007_xfer (tsc,PWRDOWN ); } -static u32 tsc2007_calculate_resistance (struct tsc2007 *tsc, +u32 tsc2007_calculate_resistance (struct tsc2007 *tsc,struct ts_event *tc) {u32 rt =0 ;@@ -158,8 +81,9 @@ static u32 tsc2007_calculate_resistance(struct tsc2007 *tsc,return rt; } +EXPORT_SYMBOL (tsc2007_calculate_resistance); -static bool tsc2007_is_pen_down (struct tsc2007 *ts) +bool tsc2007_is_pen_down (struct tsc2007 *ts) {/* * NOTE: We can't rely on the pressure to determine the pen down @@ -180,6 +104,7 @@ static bool tsc2007_is_pen_down(struct tsc2007 *ts)return ts->get_pendown_state (&ts->client->dev); } +EXPORT_SYMBOL (tsc2007_is_pen_down);static irqreturn_t tsc2007_soft_irq (int irq,void *handle) {@@ -192,7 +117,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);@@ -450,7 +378,8 @@ static void tsc2007_call_exit_platform_hw(void *data)static int tsc2007_probe (struct i2c_client *client,const struct i2c_device_id *id) { -const struct tsc2007_platform_data *pdata =dev_get_platdata (&client->dev); +const struct tsc2007_platform_data *pdata = +dev_get_platdata (&client->dev);struct tsc2007 *ts;struct input_dev *input_dev;int err;@@ -472,7 +401,13 @@ static int tsc2007_probe(struct i2c_client *client, ts->client = client; ts->irq = client->irq; ts->input = input_dev; + + err =tsc2007_iio_configure (ts); +if (err <0 ) +return err; +init_waitqueue_head (&ts->wait); +mutex_init (&ts->mlock);snprintf (ts->phys,sizeof (ts->phys),"%s/input0" ,dev_name (&client->dev));@@ -494,7 +429,7 @@ static int tsc2007_probe(struct i2c_client *client,if (pdata) { err =tsc2007_probe_pdev (client, ts, pdata, id);if (err) -return err; + goto probe_err;input_set_abs_params (input_dev,ABS_X ,0 , ts->max_x-ts->min_x, ts->fuzzx,0 ); input_set_abs_params(input_dev, ABS_Y, 0, ts->max_y-ts->min_y,@@ -504,7 +439,7 @@ static int tsc2007_probe(struct i2c_client *client, }else { err =tsc2007_probe_dt (client, ts);if (err) -return err; + goto probe_err; }if (pdata) {@@ -516,7 +451,7 @@ static int tsc2007_probe(struct i2c_client *client,dev_err (&client->dev,"Failed to register exit_platform_hw action, %d\n" , err); -return err; + goto probe_err; } }@@ -533,7 +468,7 @@ static int tsc2007_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"Failed to request irq %d: %d\n" , ts->irq, err); -return err; + goto probe_err; }tsc2007_stop (ts);@@ -543,17 +478,30 @@ static int tsc2007_probe(struct i2c_client *client,if (err <0 ) {dev_err (&client->dev,"Failed to setup chip: %d\n" , err); -return err;/* usually, chip does not respond */ + goto probe_err;/* chip does not respond */ } err =input_register_device (input_dev);if (err) {dev_err (&client->dev,"Failed to register input device: %d\n" , err); -return err; + goto probe_err; }return 0 ; + +probe_err: +tsc2007_iio_unconfigure (ts); +return err; +} + +static int tsc2007_remove (struct i2c_client *client) +{ +struct tsc2007 *ts =i2c_get_clientdata (client); + +tsc2007_iio_unconfigure (ts); +input_unregister_device (ts->input); +return 0 ; }static const struct i2c_device_id tsc2007_idtable[] = {@@ -578,6 +526,7 @@ static struct i2c_driver tsc2007_driver = { }, .id_table = tsc2007_idtable, .probe = tsc2007_probe, + .remove = tsc2007_remove, };module_i2c_driver (tsc2007_driver);drivers/input/touchscreen/tsc2007_iio.c new file +151
-0@@ -0,0 +1,151 @@ +/* +* drivers/input/touchscreen/tsc2007_iio.c +* +* Copyright (c) 2016 Golden Delicious Comp. GmbH&Co. KG +* Nikolaus Schaller <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include "tsc2007.h" +#include <linux/iio/iio.h> + +struct tsc2007_iio { +struct tsc2007 *ts; +}; + +#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, \ +} + +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_iio *iio =iio_priv (indio_dev); +struct tsc2007 *tsc = iio->ts; +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 , +}; + +int tsc2007_iio_configure (struct tsc2007 *ts) +{ +int err; +struct iio_dev *indio_dev; +struct tsc2007_iio *iio; + + indio_dev =devm_iio_device_alloc (&ts->client->dev, +sizeof (struct tsc2007_iio )); +if (!indio_dev) { +dev_err (&ts->client->dev,"iio_device_alloc failed\n" ); +return -ENOMEM ; + } + + iio =iio_priv (indio_dev); + iio->ts = ts; + ts->private = (void *) indio_dev; + + indio_dev->name ="tsc2007" ; + indio_dev->dev.parent = &ts->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 (&ts->client->dev,"iio_device_register() failed: %d\n" , + err); +return err; + } + +return 0 ; +} +EXPORT_SYMBOL (tsc2007_iio_configure); + +void tsc2007_iio_unconfigure (struct tsc2007 *ts) +{ +struct iio_dev *indio_dev = ts->private; + +iio_device_unregister (indio_dev); +} +EXPORT_SYMBOL (tsc2007_iio_unconfigure);
Dmitry Torokhov
maintainerRe: [PATCH v6 4/8] drivers:input:tsc2007: add iio interface to read external ADC input and temperature
In reply to H. Nikolaus SchallerHi Nikolaus,
Quoted 12 lines · H. Nikolaus Schaller
The 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 extension provides an iio interface for these adc channels.
Since it is not wasting much resources and is very straightforward, we simply provide all other adc channels as optional iio interfaces as weel. This can be used for debugging or special applications.
Quoted 8 lines
This patch also splits the tsc2007 driver in several source files:
tsc2007.h-- constants, structs and stubstsc2007_core.c-- functional parts of the original drivertsc2007_iio.c-- the optional iio stuff
Makefilemagic allows to conditionally link the iio stuff ifCONFIG_IIO=yin a way that it works withCONFIG_TOUCHSCREEN_TSC2007=m.
What about CONFIG_TOUCHSCREEN_TSC2007=y and CONFIG_IIO=m?
Quoted 31 lines
Signed-off-by H. Nikolaus Schaller <[email protected]>--- drivers/input/touchscreen/Makefile | 2 + drivers/input/touchscreen/tsc2007.h | 129 ++++++++++++++++++ .../touchscreen/{tsc2007.c => tsc2007_core.c} | 127 ++++++----------- drivers/input/touchscreen/tsc2007_iio.c | 151 +++++++++++++++++++++ 4 files changed, 320 insertions(+), 89 deletions(-) create mode 100644 drivers/input/touchscreen/tsc2007.h rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (84%) create mode 100644 drivers/input/touchscreen/tsc2007_iio.cdrivers/input/touchscreen/Makefile +2
-0@@ -80,6 +80,8 @@ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o obj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE) += tsc200x-core.o obj-$(CONFIG_TOUCHSCREEN_TSC2004) += tsc2004.o obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o +tsc2007-y := tsc2007_core.o +tsc2007-$(CONFIG_IIO) += tsc2007_iio.o obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.odrivers/input/touchscreen/tsc2007.h new file +0
-0
drivers/input/touchscreen/tsc2007.h line 2
Quoted 2 lines
drivers/input/touchscreen/tsc2007.h new file +2
-0@@ -0,0 +1,129 @@ +/* +* drivers/input/touchscreen/tsc2007.h
No file names in comments please.
Quoted 225 lines
drivers/input/touchscreen/tsc2007.h new file +127
-0+* +* Copyright (c) 2008 MtekVision Co., Ltd. +* Kwangwoo Lee <kwlee-ec7hoAtq5SbSUeElwK9/[email protected]> +* +* Using code from: +* - ads7846.c +* Copyright (c) 2005 David Brownell +* Copyright (c) 2006 Nokia Corporation +* - corgi_ts.c +* Copyright (C) 2004-2005 Richard Purdie +* - omap_ts.[hc], ads7846.h, ts_osk.c +* Copyright (C) 2002 MontaVista Software +* Copyright (C) 2004 Texas Instruments +* Copyright (C) 2005 Dirk Behme +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/i2c/tsc2007.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/input/touchscreen.h> + +#define TSC2007_MEASURE_TEMP0 (0x0 << 4) +#define TSC2007_MEASURE_AUX (0x2 << 4) +#define TSC2007_MEASURE_TEMP1 (0x4 << 4) +#define TSC2007_ACTIVATE_XN (0x8 << 4) +#define TSC2007_ACTIVATE_YN (0x9 << 4) +#define TSC2007_ACTIVATE_YP_XN (0xa << 4) +#define TSC2007_SETUP (0xb << 4) +#define TSC2007_MEASURE_X (0xc << 4) +#define TSC2007_MEASURE_Y (0xd << 4) +#define TSC2007_MEASURE_Z1 (0xe << 4) +#define TSC2007_MEASURE_Z2 (0xf << 4) + +#define TSC2007_POWER_OFF_IRQ_EN (0x0 << 2) +#define TSC2007_ADC_ON_IRQ_DIS0 (0x1 << 2) +#define TSC2007_ADC_OFF_IRQ_EN (0x2 << 2) +#define TSC2007_ADC_ON_IRQ_DIS1 (0x3 << 2) + +#define TSC2007_12BIT (0x0 << 1) +#define TSC2007_8BIT (0x1 << 1) + +#define MAX_12BIT ((1 << 12) - 1) + +#define ADC_ON_12BIT (TSC2007_12BIT | TSC2007_ADC_ON_IRQ_DIS0) + +#define READ_Y (ADC_ON_12BIT | TSC2007_MEASURE_Y) +#define READ_Z1 (ADC_ON_12BIT | TSC2007_MEASURE_Z1) +#define READ_Z2 (ADC_ON_12BIT | TSC2007_MEASURE_Z2) +#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X) +#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) + +struct ts_event { +u16 x; +u16 y; +u16 z1, z2; +}; + +struct tsc2007 { +struct input_dev *input; +char phys[32 ]; + +struct i2c_client *client; + +u16 model; +u16 x_plate_ohms; + +struct touchscreen_properties prop; + +bool report_resistance; +u16 min_x; +u16 min_y; +u16 max_x; +u16 max_y; +u16 max_rt; +unsigned long poll_period;/* in jiffies */ +int fuzzx; +int fuzzy; +int fuzzz; + +unsigned int gpio; +int irq; + +wait_queue_head_t wait; +bool stopped; +bool pendown; + +int (*get_pendown_state)(struct device *); +void (*clear_penirq)(void ); + +struct mutex mlock; +#ifdef CONFIG_IIO +void *private; +#endif +}; + +int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd); +u32 tsc2007_calculate_resistance (struct tsc2007 *tsc, +struct ts_event *tc); +bool tsc2007_is_pen_down (struct tsc2007 *ts); + +#ifdef CONFIG_IIO + +/* defined in tsc2007_iio.c */ +int tsc2007_iio_configure (struct tsc2007 *ts); +void tsc2007_iio_unconfigure (struct tsc2007 *ts); + +#else /* CONFIG_IIO */ + +static inline int tsc2007_iio_configure (struct tsc2007 *ts) +{ +return 0 ; +} +static inline void tsc2007_iio_unconfigure (struct tsc2007 *ts) +{ +} + +#endif /* CONFIG_IIO */ drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-80@@ -20,87 +20,9 @@* published by the Free Software Foundation. */ -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/input.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/i2c/tsc2007.h> -#include <linux/of_device.h> -#include <linux/of.h> -#include <linux/of_gpio.h> -#include <linux/input/touchscreen.h> - -#define TSC2007_MEASURE_TEMP0 (0x0 << 4) -#define TSC2007_MEASURE_AUX (0x2 << 4) -#define TSC2007_MEASURE_TEMP1 (0x4 << 4) -#define TSC2007_ACTIVATE_XN (0x8 << 4) -#define TSC2007_ACTIVATE_YN (0x9 << 4) -#define TSC2007_ACTIVATE_YP_XN (0xa << 4) -#define TSC2007_SETUP (0xb << 4) -#define TSC2007_MEASURE_X (0xc << 4) -#define TSC2007_MEASURE_Y (0xd << 4) -#define TSC2007_MEASURE_Z1 (0xe << 4) -#define TSC2007_MEASURE_Z2 (0xf << 4) - -#define TSC2007_POWER_OFF_IRQ_EN (0x0 << 2) -#define TSC2007_ADC_ON_IRQ_DIS0 (0x1 << 2) -#define TSC2007_ADC_OFF_IRQ_EN (0x2 << 2) -#define TSC2007_ADC_ON_IRQ_DIS1 (0x3 << 2) - -#define TSC2007_12BIT (0x0 << 1) -#define TSC2007_8BIT (0x1 << 1) - -#define MAX_12BIT ((1 << 12) - 1) - -#define ADC_ON_12BIT (TSC2007_12BIT | TSC2007_ADC_ON_IRQ_DIS0) - -#define READ_Y (ADC_ON_12BIT | TSC2007_MEASURE_Y) -#define READ_Z1 (ADC_ON_12BIT | TSC2007_MEASURE_Z1) -#define READ_Z2 (ADC_ON_12BIT | TSC2007_MEASURE_Z2) -#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X) -#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) - -struct ts_event { -u16 x; -u16 y; -u16 z1, z2; -}; - -struct tsc2007 { -struct input_dev *input; -char phys[32 ]; - -struct i2c_client *client; - -u16 model; -u16 x_plate_ohms; - -struct touchscreen_properties prop; - -bool report_resistance; -u16 min_x; -u16 min_y; -u16 max_x; -u16 max_y; -u16 max_rt; -unsigned long poll_period;/* in jiffies */ -int fuzzx; -int fuzzy; -int fuzzz; +#include "tsc2007.h" -unsigned gpio; -int irq; - -wait_queue_head_t wait; -bool stopped; -bool pendown; - -int (*get_pendown_state)(struct device *); -void (*clear_penirq)(void ); -}; - -static inline int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) +int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) {s32 data;u16 val;
drivers/input/touchscreen/tsc2007_core.c static inline int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd) · line 46
Quoted 4 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +1
-0@@ -121,6 +43,7 @@ static inline int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd)return val; } +EXPORT_SYMBOL (tsc2007_xfer);
Why do you export all these symbols? As far as I can tell it is still the same module, but now comprising of maybe 2 object files liked together. You do not need to export symbols in this case, liker will resolve them when building the module.
Quoted 53 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +9
-3static void tsc2007_read_values (struct tsc2007 *tsc,struct ts_event *tc) {@@ -138,7 +61,7 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc)tsc2007_xfer (tsc,PWRDOWN ); } -static u32 tsc2007_calculate_resistance (struct tsc2007 *tsc, +u32 tsc2007_calculate_resistance (struct tsc2007 *tsc,struct ts_event *tc) {u32 rt =0 ;@@ -158,8 +81,9 @@ static u32 tsc2007_calculate_resistance(struct tsc2007 *tsc,return rt; } +EXPORT_SYMBOL (tsc2007_calculate_resistance); -static bool tsc2007_is_pen_down (struct tsc2007 *ts) +bool tsc2007_is_pen_down (struct tsc2007 *ts) {/* * NOTE: We can't rely on the pressure to determine the pen down @@ -180,6 +104,7 @@ static bool tsc2007_is_pen_down(struct tsc2007 *ts)return ts->get_pendown_state (&ts->client->dev); } +EXPORT_SYMBOL (tsc2007_is_pen_down);static irqreturn_t tsc2007_soft_irq (int irq,void *handle) {@@ -192,7 +117,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);@@ -450,7 +378,8 @@ static void tsc2007_call_exit_platform_hw(void *data)static int tsc2007_probe (struct i2c_client *client,const struct i2c_device_id *id) { -const struct tsc2007_platform_data *pdata =dev_get_platdata (&client->dev); +const struct tsc2007_platform_data *pdata = +dev_get_platdata (&client->dev);struct tsc2007 *ts;struct input_dev *input_dev;int err;
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 405
Quoted 5 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-0@@ -472,7 +401,13 @@ static int tsc2007_probe(struct i2c_client *client, ts->client = client; ts->irq = client->irq; ts->input = input_dev; + + err =tsc2007_iio_configure (ts);
No, this is not going to work. From teh cursory glance at the new iio code it uses resources that you set up later in tsc2007_probe(). I'd say this needs to go last.
Quoted 63 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +12
-6+if (err <0 ) +return err; +init_waitqueue_head (&ts->wait); +mutex_init (&ts->mlock);snprintf (ts->phys,sizeof (ts->phys),"%s/input0" ,dev_name (&client->dev));@@ -494,7 +429,7 @@ static int tsc2007_probe(struct i2c_client *client,if (pdata) { err =tsc2007_probe_pdev (client, ts, pdata, id);if (err) -return err; + goto probe_err;input_set_abs_params (input_dev,ABS_X ,0 , ts->max_x-ts->min_x, ts->fuzzx,0 ); input_set_abs_params(input_dev, ABS_Y, 0, ts->max_y-ts->min_y,@@ -504,7 +439,7 @@ static int tsc2007_probe(struct i2c_client *client, }else { err =tsc2007_probe_dt (client, ts);if (err) -return err; + goto probe_err; }if (pdata) {@@ -516,7 +451,7 @@ static int tsc2007_probe(struct i2c_client *client,dev_err (&client->dev,"Failed to register exit_platform_hw action, %d\n" , err); -return err; + goto probe_err; } }@@ -533,7 +468,7 @@ static int tsc2007_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"Failed to request irq %d: %d\n" , ts->irq, err); -return err; + goto probe_err; }tsc2007_stop (ts);@@ -543,17 +478,30 @@ static int tsc2007_probe(struct i2c_client *client,if (err <0 ) {dev_err (&client->dev,"Failed to setup chip: %d\n" , err); -return err;/* usually, chip does not respond */ + goto probe_err;/* chip does not respond */ } err =input_register_device (input_dev);if (err) {dev_err (&client->dev,"Failed to register input device: %d\n" , err); -return err; + goto probe_err; }return 0 ; + +probe_err:
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 503
Quoted 10 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +10
-0+tsc2007_iio_unconfigure (ts); +return err; +} + +static int tsc2007_remove (struct i2c_client *client) +{ +struct tsc2007 *ts =i2c_get_clientdata (client); + +tsc2007_iio_unconfigure (ts); +input_unregister_device (ts->input);
Why did you add input_unregister_device() for devm-managed device?
Quoted 172 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-0+return 0 ; }static const struct i2c_device_id tsc2007_idtable[] = {@@ -578,6 +526,7 @@ static struct i2c_driver tsc2007_driver = { }, .id_table = tsc2007_idtable, .probe = tsc2007_probe, + .remove = tsc2007_remove, };module_i2c_driver (tsc2007_driver);drivers/input/touchscreen/tsc2007_iio.c new file +151
-0@@ -0,0 +1,151 @@ +/* +* drivers/input/touchscreen/tsc2007_iio.c +* +* Copyright (c) 2016 Golden Delicious Comp. GmbH&Co. KG +* Nikolaus Schaller <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include "tsc2007.h" +#include <linux/iio/iio.h> + +struct tsc2007_iio { +struct tsc2007 *ts; +}; + +#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, \ +} + +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_iio *iio =iio_priv (indio_dev); +struct tsc2007 *tsc = iio->ts; +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 , +}; + +int tsc2007_iio_configure (struct tsc2007 *ts) +{ +int err; +struct iio_dev *indio_dev; +struct tsc2007_iio *iio; + + indio_dev =devm_iio_device_alloc (&ts->client->dev, +sizeof (struct tsc2007_iio )); +if (!indio_dev) { +dev_err (&ts->client->dev,"iio_device_alloc failed\n" ); +return -ENOMEM ; + } + + iio =iio_priv (indio_dev); + iio->ts = ts; + ts->private = (void *) indio_dev; + + indio_dev->name ="tsc2007" ; + indio_dev->dev.parent = &ts->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 (&ts->client->dev,"iio_device_register() failed: %d\n" , + err); +return err; + } + +return 0 ; +} +EXPORT_SYMBOL (tsc2007_iio_configure); + +void tsc2007_iio_unconfigure (struct tsc2007 *ts) +{ +struct iio_dev *indio_dev = ts->private; + +iio_device_unregister (indio_dev); +} +EXPORT_SYMBOL (tsc2007_iio_unconfigure);Signature · 1 line
2.7.3
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v6 4/8] drivers:input:tsc2007: add iio interface to read external ADC input and temperature
Hi Dmitry,
Quoted 22 lines
Am 19.11.2016 um 19:36 schrieb Dmitry Torokhov <[email protected]>:
Hi Nikolaus,
Quoted 17 lines · H. Nikolaus Schaller
The 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 extension provides an iio interface for these adc channels.
Since it is not wasting much resources and is very straightforward, we simply provide all other adc channels as optional iio interfaces as weel. This can be used for debugging or special applications.
This patch also splits the tsc2007 driver in several source files:
tsc2007.h-- constants, structs and stubstsc2007_core.c-- functional parts of the original drivertsc2007_iio.c-- the optional iio stuff
Quoted 5 lines
Quoted 3 lines
Makefilemagic allows to conditionally link the iio stuff ifCONFIG_IIO=yin a way that it works withCONFIG_TOUCHSCREEN_TSC2007=m.What about
CONFIG_TOUCHSCREEN_TSC2007=yandCONFIG_IIO=m?
see reply to v7.
Quoted 28 lines
Quoted 28 lines
Signed-off-by H. Nikolaus Schaller <[email protected]>---
drivers/input/touchscreen/Makefile | 2 + drivers/input/touchscreen/tsc2007.h | 129 ++++++++++++++++++ .../touchscreen/{tsc2007.c => tsc2007_core.c} | 127 ++++++----------- drivers/input/touchscreen/tsc2007_iio.c | 151 +++++++++++++++++++++ 4 files changed, 320 insertions(+), 89 deletions(-)create mode 100644
drivers/input/touchscreen/tsc2007.hrenamedrivers/input/touchscreen/{tsc2007.c=>tsc2007_core.c} (84%) create mode 100644drivers/input/touchscreen/tsc2007_iio.cdrivers/input/touchscreen/Makefile +0
-0@@ -80,6 +80,8 @@ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.oobj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE) += tsc200x-core.o
obj-$(CONFIG_TOUCHSCREEN_TSC2004) += tsc2004.o
obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.odrivers/input/touchscreen/Makefile +2
-0+tsc2007-y := tsc2007_core.o +tsc2007-$(CONFIG_IIO) += tsc2007_iio.oobj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.odrivers/input/touchscreen/tsc2007.h new file +0
-0
Quoted 8 lines
drivers/input/touchscreen/tsc2007.h line 2
Quoted 6 lines
index 0000000..87d5ce5
drivers/input/touchscreen/tsc2007.h new file +2
-0@@ -0,0 +1,129 @@ +/* +* drivers/input/touchscreen/tsc2007.h No file names in comments please.
Ok. Will be removed in v8.
Quoted 227 lines
Quoted 227 lines
drivers/input/touchscreen/tsc2007.h new file +127
-0+* +* Copyright (c) 2008 MtekVision Co., Ltd. +* Kwangwoo Lee <[email protected]> +* +* Using code from: +* - ads7846.c +* Copyright (c) 2005 David Brownell +* Copyright (c) 2006 Nokia Corporation +* - corgi_ts.c +* Copyright (C) 2004-2005 Richard Purdie +* - omap_ts.[hc], ads7846.h, ts_osk.c +* Copyright (C) 2002 MontaVista Software +* Copyright (C) 2004 Texas Instruments +* Copyright (C) 2005 Dirk Behme +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/i2c/tsc2007.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/input/touchscreen.h> + +#define TSC2007_MEASURE_TEMP0 (0x0 << 4) +#define TSC2007_MEASURE_AUX (0x2 << 4) +#define TSC2007_MEASURE_TEMP1 (0x4 << 4) +#define TSC2007_ACTIVATE_XN (0x8 << 4) +#define TSC2007_ACTIVATE_YN (0x9 << 4) +#define TSC2007_ACTIVATE_YP_XN (0xa << 4) +#define TSC2007_SETUP (0xb << 4) +#define TSC2007_MEASURE_X (0xc << 4) +#define TSC2007_MEASURE_Y (0xd << 4) +#define TSC2007_MEASURE_Z1 (0xe << 4) +#define TSC2007_MEASURE_Z2 (0xf << 4) + +#define TSC2007_POWER_OFF_IRQ_EN (0x0 << 2) +#define TSC2007_ADC_ON_IRQ_DIS0 (0x1 << 2) +#define TSC2007_ADC_OFF_IRQ_EN (0x2 << 2) +#define TSC2007_ADC_ON_IRQ_DIS1 (0x3 << 2) + +#define TSC2007_12BIT (0x0 << 1) +#define TSC2007_8BIT (0x1 << 1) + +#define MAX_12BIT ((1 << 12) - 1) + +#define ADC_ON_12BIT (TSC2007_12BIT | TSC2007_ADC_ON_IRQ_DIS0) + +#define READ_Y (ADC_ON_12BIT | TSC2007_MEASURE_Y) +#define READ_Z1 (ADC_ON_12BIT | TSC2007_MEASURE_Z1) +#define READ_Z2 (ADC_ON_12BIT | TSC2007_MEASURE_Z2) +#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X) +#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) + +struct ts_event { +u16 x; +u16 y; +u16 z1, z2; +}; + +struct tsc2007 { +struct input_dev *input; +char phys[32 ]; + +struct i2c_client *client; + +u16 model; +u16 x_plate_ohms; + +struct touchscreen_properties prop; + +bool report_resistance; +u16 min_x; +u16 min_y; +u16 max_x; +u16 max_y; +u16 max_rt; +unsigned long poll_period;/* in jiffies */ +int fuzzx; +int fuzzy; +int fuzzz; + +unsigned int gpio; +int irq; + +wait_queue_head_t wait; +bool stopped; +bool pendown; + +int (*get_pendown_state)(struct device *); +void (*clear_penirq)(void ); + +struct mutex mlock; +#ifdef CONFIG_IIO +void *private; +#endif +}; + +int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd); +u32 tsc2007_calculate_resistance (struct tsc2007 *tsc, +struct ts_event *tc); +bool tsc2007_is_pen_down (struct tsc2007 *ts); + +#ifdef CONFIG_IIO + +/* defined in tsc2007_iio.c */ +int tsc2007_iio_configure (struct tsc2007 *ts); +void tsc2007_iio_unconfigure (struct tsc2007 *ts); + +#else /* CONFIG_IIO */ + +static inline int tsc2007_iio_configure (struct tsc2007 *ts) +{ +return 0 ; +} +static inline void tsc2007_iio_unconfigure (struct tsc2007 *ts) +{ +} + +#endif /* CONFIG_IIO */ drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-80@@ -20,87 +20,9 @@* published by the Free Software Foundation. */ -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/input.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/i2c/tsc2007.h> -#include <linux/of_device.h> -#include <linux/of.h> -#include <linux/of_gpio.h> -#include <linux/input/touchscreen.h> - -#define TSC2007_MEASURE_TEMP0 (0x0 << 4) -#define TSC2007_MEASURE_AUX (0x2 << 4) -#define TSC2007_MEASURE_TEMP1 (0x4 << 4) -#define TSC2007_ACTIVATE_XN (0x8 << 4) -#define TSC2007_ACTIVATE_YN (0x9 << 4) -#define TSC2007_ACTIVATE_YP_XN (0xa << 4) -#define TSC2007_SETUP (0xb << 4) -#define TSC2007_MEASURE_X (0xc << 4) -#define TSC2007_MEASURE_Y (0xd << 4) -#define TSC2007_MEASURE_Z1 (0xe << 4) -#define TSC2007_MEASURE_Z2 (0xf << 4) - -#define TSC2007_POWER_OFF_IRQ_EN (0x0 << 2) -#define TSC2007_ADC_ON_IRQ_DIS0 (0x1 << 2) -#define TSC2007_ADC_OFF_IRQ_EN (0x2 << 2) -#define TSC2007_ADC_ON_IRQ_DIS1 (0x3 << 2) - -#define TSC2007_12BIT (0x0 << 1) -#define TSC2007_8BIT (0x1 << 1) - -#define MAX_12BIT ((1 << 12) - 1) - -#define ADC_ON_12BIT (TSC2007_12BIT | TSC2007_ADC_ON_IRQ_DIS0) - -#define READ_Y (ADC_ON_12BIT | TSC2007_MEASURE_Y) -#define READ_Z1 (ADC_ON_12BIT | TSC2007_MEASURE_Z1) -#define READ_Z2 (ADC_ON_12BIT | TSC2007_MEASURE_Z2) -#define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X) -#define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN) - -struct ts_event { -u16 x; -u16 y; -u16 z1, z2; -}; - -struct tsc2007 { -struct input_dev *input; -char phys[32 ]; - -struct i2c_client *client; - -u16 model; -u16 x_plate_ohms; - -struct touchscreen_properties prop; - -bool report_resistance; -u16 min_x; -u16 min_y; -u16 max_x; -u16 max_y; -u16 max_rt; -unsigned long poll_period;/* in jiffies */ -int fuzzx; -int fuzzy; -int fuzzz; +#include "tsc2007.h" -unsigned gpio; -int irq; - -wait_queue_head_t wait; -bool stopped; -bool pendown; - -int (*get_pendown_state)(struct device *); -void (*clear_penirq)(void ); -}; - -static inline int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) +int tsc2007_xfer (struct tsc2007 *tsc,u8 cmd) {s32 data;u16 val;@@ -121,6 +43,7 @@ static inline int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd)
Quoted 8 lines
drivers/input/touchscreen/tsc2007_core.c static inline int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd) · line 46
Quoted 3 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +1
-0return val; } +EXPORT_SYMBOL (tsc2007_xfer);Why do you export all these symbols? As far as I can tell it is still the same module, but now comprising of maybe 2 object files liked together. You do not need to export symbols in this case, liker will resolve them when building the module.
Ah, ok.
This has remained from some intermediate version where it was necessary to export them.
Tested in v8 to be no longer necessary.
Quoted 55 lines
Quoted 55 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +9
-3static void tsc2007_read_values (struct tsc2007 *tsc,struct ts_event *tc) {@@ -138,7 +61,7 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc)tsc2007_xfer (tsc,PWRDOWN ); } -static u32 tsc2007_calculate_resistance (struct tsc2007 *tsc, +u32 tsc2007_calculate_resistance (struct tsc2007 *tsc,struct ts_event *tc) {u32 rt =0 ;@@ -158,8 +81,9 @@ static u32 tsc2007_calculate_resistance(struct tsc2007 *tsc,return rt; } +EXPORT_SYMBOL (tsc2007_calculate_resistance); -static bool tsc2007_is_pen_down (struct tsc2007 *ts) +bool tsc2007_is_pen_down (struct tsc2007 *ts) {/* * NOTE: We can't rely on the pressure to determine the pen down @@ -180,6 +104,7 @@ static bool tsc2007_is_pen_down(struct tsc2007 *ts)return ts->get_pendown_state (&ts->client->dev); } +EXPORT_SYMBOL (tsc2007_is_pen_down);static irqreturn_t tsc2007_soft_irq (int irq,void *handle) {@@ -192,7 +117,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);@@ -450,7 +378,8 @@ static void tsc2007_call_exit_platform_hw(void *data)static int tsc2007_probe (struct i2c_client *client,const struct i2c_device_id *id) { -const struct tsc2007_platform_data *pdata =dev_get_platdata (&client->dev); +const struct tsc2007_platform_data *pdata = +dev_get_platdata (&client->dev);struct tsc2007 *ts;struct input_dev *input_dev;int err;@@ -472,7 +401,13 @@ static int tsc2007_probe(struct i2c_client *client, ts->client = client;
Quoted 8 lines
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 405
Quoted 4 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-0ts->irq = client->irq; ts->input = input_dev; + + err =tsc2007_iio_configure (ts);No, this is not going to work. From teh cursory glance at the new iio code it uses resources that you set up later in
tsc2007_probe(). I'd say this needs to go last.
Ok, it looks as if it now can be moved to the end of the probe function. The original code did the memory allocation inside and therefore was required to be done first. Now it creates an iio wrapper around the "ts" struct.
Tested to compile and work.
Quoted 62 lines
Quoted 62 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +5
-1+if (err <0 ) +return err; +init_waitqueue_head (&ts->wait); +mutex_init (&ts->mlock);snprintf (ts->phys,sizeof (ts->phys),"%s/input0" ,dev_name (&client->dev));@@ -494,7 +429,7 @@ static int tsc2007_probe(struct i2c_client *client,if (pdata) { err =tsc2007_probe_pdev (client, ts, pdata, id);if (err) -return err; + goto probe_err;input_set_abs_params (input_dev,ABS_X ,0 , ts->max_x-ts->min_x, ts->fuzzx,0 );input_set_abs_params(input_dev, ABS_Y, 0, ts->max_y-ts->min_y,drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +5
-5@@ -504,7 +439,7 @@ static int tsc2007_probe(struct i2c_client *client, }else { err =tsc2007_probe_dt (client, ts);if (err) -return err; + goto probe_err; }if (pdata) {@@ -516,7 +451,7 @@ static int tsc2007_probe(struct i2c_client *client,dev_err (&client->dev,"Failed to register exit_platform_hw action, %d\n" , err); -return err; + goto probe_err; } }@@ -533,7 +468,7 @@ static int tsc2007_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"Failed to request irq %d: %d\n" , ts->irq, err); -return err; + goto probe_err; }tsc2007_stop (ts);@@ -543,17 +478,30 @@ static int tsc2007_probe(struct i2c_client *client,if (err <0 ) {dev_err (&client->dev,"Failed to setup chip: %d\n" , err); -return err;/* usually, chip does not respond */ + goto probe_err;/* chip does not respond */ } err =input_register_device (input_dev);if (err) {dev_err (&client->dev,"Failed to register input device: %d\n" , err); -return err; + goto probe_err; }
Quoted 3 lines
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 493
Quoted 3 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-0return 0 ; + +probe_err:
This probe_err/unconfigure is then no longer needed if configure is the last step and I will remove.
Quoted 13 lines
drivers/input/touchscreen/tsc2007_core.c static int tsc2007_probe(struct i2c_client *client, · line 503
Quoted 11 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +10
-0+tsc2007_iio_unconfigure (ts); +return err; +} + +static int tsc2007_remove (struct i2c_client *client) +{ +struct tsc2007 *ts =i2c_get_clientdata (client); + +tsc2007_iio_unconfigure (ts); +input_unregister_device (ts->input);Why did you add
input_unregister_device()for devm-managed device?
Is input_register_device devm based? The function name seems to require an explicit unregister step.
But since you say it is not required, I have removed it from v8.
Quoted 167 lines
Quoted 167 lines
drivers/input/touchscreen/tsc2007_core.c renamed from drivers/input/touchscreen/tsc2007.c +2
-0+return 0 ; }static const struct i2c_device_id tsc2007_idtable[] = {@@ -578,6 +526,7 @@ static struct i2c_driver tsc2007_driver = { }, .id_table = tsc2007_idtable, .probe = tsc2007_probe, + .remove = tsc2007_remove, };module_i2c_driver (tsc2007_driver);drivers/input/touchscreen/tsc2007_iio.c new file +148
-0@@ -0,0 +1,151 @@ +/* +* drivers/input/touchscreen/tsc2007_iio.c +* +* Copyright (c) 2016 Golden Delicious Comp. GmbH&Co. KG +* Nikolaus Schaller <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include "tsc2007.h" +#include <linux/iio/iio.h> + +struct tsc2007_iio { +struct tsc2007 *ts; +}; + +#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, \ +} + +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_iio *iio =iio_priv (indio_dev); +struct tsc2007 *tsc = iio->ts; +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 , +}; + +int tsc2007_iio_configure (struct tsc2007 *ts) +{ +int err; +struct iio_dev *indio_dev; +struct tsc2007_iio *iio; + + indio_dev =devm_iio_device_alloc (&ts->client->dev, +sizeof (struct tsc2007_iio )); +if (!indio_dev) { +dev_err (&ts->client->dev,"iio_device_alloc failed\n" ); +return -ENOMEM ; + } + + iio =iio_priv (indio_dev); + iio->ts = ts; + ts->private = (void *) indio_dev; + + indio_dev->name ="tsc2007" ; + indio_dev->dev.parent = &ts->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 (&ts->client->dev,"iio_device_register() failed: %d\n" , + err); +return err; + } + +return 0 ; +} +EXPORT_SYMBOL (tsc2007_iio_configure); + +void tsc2007_iio_unconfigure (struct tsc2007 *ts) +{ +struct iio_dev *indio_dev = ts->private; +
Quoted 11 lines
Quoted 6 lines
drivers/input/touchscreen/tsc2007_iio.c new file +3
-0+iio_device_unregister (indio_dev); +} +EXPORT_SYMBOL (tsc2007_iio_unconfigure);Signature · 1 line
2.7.3Thanks.
Signature · 1 line
Dmitry
BR and thanks,
Nikolaus
PATCH v6 5/8 DT:omap3+tsc2007: use new common touchscreen bindings
In reply to H. Nikolaus SchallerWhile we fix the GTA04 we add proper pinmux for the penirq gpio.
Tested on: GTA04A4 and Pyra-Handheld
--- arch/arm/boot/dts/omap3-gta04.dtsi | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +23 -2
@@ -273,6 +273,13 @@ OMAP3_CORE1_IOPAD(0x2134, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio112 */ >; }; + + penirq_pins: pinmux_penirq_pins { + pinctrl-single,pins = < + /* here we could enable to wakeup the cpu from suspend by a pen touch */ + OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio160 */ + >; + }; }; &omap3_pmx_core2 {
@@ -410,10 +417,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 = <3>; + touchscreen-fuzz-y = <8>; + 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>; }; /* RFID EEPROM */
Signature · 1 line
2.7.3
Re: [PATCH v6 5/8] DT:omap3+tsc2007: use new common touchscreen bindings
Quoted 6 lines · H. Nikolaus Schaller
While we fix the GTA04 we add proper pinmux for the penirq gpio.
Tested on: GTA04A4 and Pyra-Handheld
Signed-off-by H. Nikolaus Schaller <[email protected]>
This should be safe to merge along with the driver changes:
Quoted 52 lines
--- arch/arm/boot/dts/omap3-gta04.dtsi | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)arch/arm/boot/dts/omap3-gta04.dtsi +23
-2@@ -273,6 +273,13 @@ OMAP3_CORE1_IOPAD(0x2134, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio112 */ >; }; + + penirq_pins: pinmux_penirq_pins { + pinctrl-single,pins = < + /* here we could enable to wakeup the cpu from suspend by a pen touch */ + OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio160 */ + >; + }; }; &omap3_pmx_core2 {@@ -410,10 +417,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 = <3>; + touchscreen-fuzz-y = <8>; + 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>; }; /* RFID EEPROM */Signature · 1 line
2.7.3
PATCH v6 6/8 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.
commit ed7c9870c9bc ("Input: of_touchscreen - add support for inverted / swapped axes") added another helper for parsing axis inversion and swapping
and applying them to x and y coordinates.
Both helpers have been integrated to accommodate any orientation of the touch panel in relation to the LCD.
A new feature is to introduce scaling the min/max ADC values to the screen size.
This makes it possible to pre-calibrate the touch so that is (almost) exactly matches the LCD pixel coordinates it is glued onto. This allows to well enough operate the touch before a user space calibration step can improve the precision.
[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
--- .../devicetree/bindings/input/ads7846.txt | 9 +++- drivers/input/touchscreen/ads7846.c | 60 ++++++++++++++++++---- 2 files changed, 57 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/input/ads7846.txt +8 -1
@@ -26,6 +26,12 @@ 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).
@@ -33,7 +39,7 @@ Optional properties: (ADS7846). ti,keep-vref-on set to keep vref on for differential measurements as well - ti,swap-xy swap x and y axis + ti,swap-xy deprecated name for touchscreen-swapped-x-y 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,
@@ -82,6 +88,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 +49 -11
116 lines not on this page · raw message
Signature · 1 line
2.7.3
Re: [PATCH v6 6/8] drivers:input:ads7846(+tsc2046): add new common binding names, pre-calibration and flipping
Quoted 19 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.commit
ed7c9870c9bc("Input:of_touchscreen- add support for inverted / swapped axes") added another helper for parsing axis inversion and swapping
and applying them to x and y coordinates.Both helpers have been integrated to accommodate any orientation of the touch panel in relation to the LCD.
A new feature is to introduce scaling the min/max ADC values to the screen size.
This makes it possible to pre-calibrate the touch so that is (almost) exactly matches the LCD pixel coordinates it is glued onto. This allows to well enough operate the touch before a user space calibration step can improve the precision.
Quoted 7 lines
[1]:
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txtSigned-off-by H. Nikolaus Schaller <[email protected]>--- .../devicetree/bindings/input/ads7846.txt | 9 +++- drivers/input/touchscreen/ads7846.c | 60 ++++++++++++++++++---- 2 files changed, 57 insertions(+), 12 deletions(-)
PATCH v6 7/8 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, 10 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ads7846.c +10 -1
@@ -1532,6 +1532,16 @@ 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" ,
@@ -1546,4 +1556,3 @@ module_spi_driver(ads7846_driver);MODULE_DESCRIPTION ("ADS7846 TouchScreen Driver" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("spi:ads7846" );
Signature · 1 line
2.7.3
Dmitry Torokhov
maintainerRe: [PATCH v6 7/8] drivers:input:ads7846(+tsc2046): fix spi module table
Quoted 2 lines · H. Nikolaus Schaller
Fix module table so that the driver is loaded if compiled as module and requested by DT.
We really need to fix it between spi/i23c core and module utils instead of keeping adding duplicate IDs all over drivers. We already have OF module device table containing the same data, we should be able to use it.
Thanks.
Quoted 35 lines
Signed-off-by H. Nikolaus Schaller <[email protected]>--- drivers/input/touchscreen/ads7846.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/input/touchscreen/ads7846.c +10
-1@@ -1532,6 +1532,16 @@ 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" ,@@ -1546,4 +1556,3 @@ module_spi_driver(ads7846_driver);MODULE_DESCRIPTION ("ADS7846 TouchScreen Driver" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("spi:ads7846" );Signature · 1 line
2.7.3
Signature · 1 line
Dmitry
Re: [PATCH v6 7/8] drivers:input:ads7846(+tsc2046): fix spi module table
Hi Dmitry,
Quoted 10 lines
Am 19.11.2016 um 19:18 schrieb Dmitry Torokhov <[email protected]>:
Quoted 2 lines · H. Nikolaus Schaller
Fix module table so that the driver is loaded if compiled as module and requested by DT.
We really need to fix it between spi/i23c core and module utils instead of keeping adding duplicate IDs all over drivers. We already have OF module device table containing the same data, we should be able to use it.
Is someone working on that so that we can rely on it in the next merge window?
Otherwise I have no idea what I could change in this driver to make it working. So I leave it as is for v8.
Quoted 32 lines
Thanks.
Quoted 29 lines
Signed-off-by H. Nikolaus Schaller <[email protected]>---
drivers/input/touchscreen/ads7846.c| 11 ++++++++++-1 file changed, 10 insertions(+), 1 deletion(-)drivers/input/touchscreen/ads7846.c +10
-0@@ -1532,6 +1532,16 @@ 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" ,@@ -1546,4 +1556,3 @@ module_spi_driver(ads7846_driver);
Quoted 9 lines
Quoted 6 lines
drivers/input/touchscreen/ads7846.c +0
-1MODULE_DESCRIPTION ("ADS7846 TouchScreen Driver" );MODULE_LICENSE ("GPL" ); -MODULE_ALIAS ("spi:ads7846" );Signature · 1 line
2.7.3Signature · 1 line
Dmitry
BR and thanks,
Nikolaus
Re: [PATCH v6 7/8] drivers:input:ads7846(+tsc2046): fix spi module table
In reply to Dmitry TorokhovHello Dmitry,
Quoted 9 lines · Dmitry Torokhov
Quoted 2 lines · H. Nikolaus Schaller
Fix module table so that the driver is loaded if compiled as module and requested by DT.
We really need to fix it between spi/i23c core and module utils instead of keeping adding duplicate IDs all over drivers. We already have OF module device table containing the same data, we should be able to use it.
Agreed, unfortunately until the I2C and SPI core are changed to properly report OF modaliases, we will have to keep adding these duplicated IDs.
And changing the I2C and SPI core isn't trivial since it could break a lot of drivers that rely on a platform modalias being reported (i.e: no OF device IDs present in the drivers even when are registered via DT).
Best regards,
Signature · 7 lines
Javier Martinez Canillas Open Source Group Samsung Research America -- 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 v6 8/8 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
Tested with OpenPandora.
--- 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 | 3 ++- 3 files changed, 16 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; wakeup-source; };
arch/arm/boot/dts/omap3-pandora-common.dtsi +13 -4
@@ -700,10 +700,19 @@ pendown-gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; 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 +2 -1
@@ -66,6 +66,7 @@ ti,x-plate-ohms = /bits/ 16 <40>; ti,pressure-max = /bits/ 16 <255>; ti,swap-xy; - wakeup-source; + touchscreen-swapped-x-y; + linux,wakeup; }; };
Signature · 6 lines
2.7.3 -- 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