* [PATCH 1/6] input: ti_am335x_tsc: set ADCREFM for X configuration
2021-10-24 14:59 [PATCH 0/6] input: touchscreen: am335x: fix and improvements Dario Binacchi
@ 2021-10-24 14:59 ` Dario Binacchi
2021-10-24 14:59 ` [PATCH 2/6] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2 Dario Binacchi
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Dario Binacchi @ 2021-10-24 14:59 UTC (permalink / raw)
To: linux-kernel; +Cc: Dario Binacchi, Dmitry Torokhov, Rachna Patil, linux-input
As reported by the STEPCONFIG[1-16] registered field descriptions of the
TI reference manual, for the ADC "in single ended, SEL_INM_SWC_3_0 must
be 1xxx".
Unlike the Y and Z coordinates, this bit has not been set for the step
configuration registers used to sample the X coordinate.
Fixes: 1b8be32e691 ("Input: add support for TI Touchscreen controller")
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/input/touchscreen/ti_am335x_tsc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 83e685557a19..fd3ffdd23470 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -131,7 +131,8 @@ static void titsc_step_config(struct titsc *ts_dev)
u32 stepenable;
config = STEPCONFIG_MODE_HWSYNC |
- STEPCONFIG_AVG_16 | ts_dev->bit_xp;
+ STEPCONFIG_AVG_16 | ts_dev->bit_xp |
+ STEPCONFIG_INM_ADCREFM;
switch (ts_dev->wires) {
case 4:
config |= STEPCONFIG_INP(ts_dev->inp_yp) | ts_dev->bit_xn;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/6] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2
2021-10-24 14:59 [PATCH 0/6] input: touchscreen: am335x: fix and improvements Dario Binacchi
2021-10-24 14:59 ` [PATCH 1/6] input: ti_am335x_tsc: set ADCREFM for X configuration Dario Binacchi
@ 2021-10-24 14:59 ` Dario Binacchi
2021-10-24 14:59 ` [PATCH 3/6] input: ti_am335x_tsc: lower the X and Y sampling time Dario Binacchi
2021-10-24 14:59 ` [PATCH 4/6] dt-bindings: input: ti-tsc-adc: fix tsc node example Dario Binacchi
3 siblings, 0 replies; 6+ messages in thread
From: Dario Binacchi @ 2021-10-24 14:59 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, Dmitry Torokhov, Sebastian Andrzej Siewior,
linux-input
The Z2 step configuration doesn't erase the SEL_INP_SWC_3_0 bit-field
before setting the ADC channel. This way its value could be corrupted by
the ADC channel selected for the Z1 coordinate.
Fixes: 8c896308fea ("input: ti_am335x_adc: use only FIFO0 and clean up a little")
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index fd3ffdd23470..cfc943423241 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -196,7 +196,10 @@ static void titsc_step_config(struct titsc *ts_dev)
STEPCONFIG_OPENDLY);
end_step++;
- config |= STEPCONFIG_INP(ts_dev->inp_yn);
+ config = STEPCONFIG_MODE_HWSYNC |
+ STEPCONFIG_AVG_16 | ts_dev->bit_yp |
+ ts_dev->bit_xn | STEPCONFIG_INM_ADCREFM |
+ STEPCONFIG_INP(ts_dev->inp_yn);
titsc_writel(ts_dev, REG_STEPCONFIG(end_step), config);
titsc_writel(ts_dev, REG_STEPDELAY(end_step),
STEPCONFIG_OPENDLY);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/6] input: ti_am335x_tsc: lower the X and Y sampling time
2021-10-24 14:59 [PATCH 0/6] input: touchscreen: am335x: fix and improvements Dario Binacchi
2021-10-24 14:59 ` [PATCH 1/6] input: ti_am335x_tsc: set ADCREFM for X configuration Dario Binacchi
2021-10-24 14:59 ` [PATCH 2/6] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2 Dario Binacchi
@ 2021-10-24 14:59 ` Dario Binacchi
2021-10-24 14:59 ` [PATCH 4/6] dt-bindings: input: ti-tsc-adc: fix tsc node example Dario Binacchi
3 siblings, 0 replies; 6+ messages in thread
From: Dario Binacchi @ 2021-10-24 14:59 UTC (permalink / raw)
To: linux-kernel; +Cc: Dario Binacchi, Dmitry Torokhov, linux-input
The open delay time has to be applied only on the first sample of the
X/Y coordinates because on the following samples the ADC channel is not
changed. Removing this time from the samples after the first one,
"ti,coordinate-readouts" greater than 1, decreases the total acquisition
time, allowing to increase the number of acquired coordinates in the time
unit.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/input/touchscreen/ti_am335x_tsc.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index cfc943423241..f4ef218bc1b8 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -126,7 +126,7 @@ static int titsc_config_wires(struct titsc *ts_dev)
static void titsc_step_config(struct titsc *ts_dev)
{
unsigned int config;
- int i;
+ int i, n;
int end_step, first_step, tsc_steps;
u32 stepenable;
@@ -151,9 +151,11 @@ static void titsc_step_config(struct titsc *ts_dev)
first_step = TOTAL_STEPS - tsc_steps;
/* Steps 16 to 16-coordinate_readouts is for X */
end_step = first_step + tsc_steps;
+ n = 0;
for (i = end_step - ts_dev->coordinate_readouts; i < end_step; i++) {
titsc_writel(ts_dev, REG_STEPCONFIG(i), config);
- titsc_writel(ts_dev, REG_STEPDELAY(i), STEPCONFIG_OPENDLY);
+ titsc_writel(ts_dev, REG_STEPDELAY(i),
+ n++ == 0 ? STEPCONFIG_OPENDLY : 0);
}
config = 0;
@@ -175,9 +177,11 @@ static void titsc_step_config(struct titsc *ts_dev)
/* 1 ... coordinate_readouts is for Y */
end_step = first_step + ts_dev->coordinate_readouts;
+ n = 0;
for (i = first_step; i < end_step; i++) {
titsc_writel(ts_dev, REG_STEPCONFIG(i), config);
- titsc_writel(ts_dev, REG_STEPDELAY(i), STEPCONFIG_OPENDLY);
+ titsc_writel(ts_dev, REG_STEPDELAY(i),
+ n++ == 0 ? STEPCONFIG_OPENDLY : 0);
}
/* Make CHARGECONFIG same as IDLECONFIG */
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/6] dt-bindings: input: ti-tsc-adc: fix tsc node example
2021-10-24 14:59 [PATCH 0/6] input: touchscreen: am335x: fix and improvements Dario Binacchi
` (2 preceding siblings ...)
2021-10-24 14:59 ` [PATCH 3/6] input: ti_am335x_tsc: lower the X and Y sampling time Dario Binacchi
@ 2021-10-24 14:59 ` Dario Binacchi
2021-10-29 2:13 ` Rob Herring
3 siblings, 1 reply; 6+ messages in thread
From: Dario Binacchi @ 2021-10-24 14:59 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, Dmitry Torokhov, Rob Herring, devicetree,
linux-input
The commit c9aeb249bf72e ("Input: ti_am335x_tsc - fix spelling mistake
in TSC/ADC DT binding") didn't fix the typo mistake in the tsc node of
the example.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
.../devicetree/bindings/input/touchscreen/ti-tsc-adc.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
index aad5e34965eb..2013fd7c4a10 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
@@ -77,7 +77,7 @@ Example:
tsc {
ti,wires = <4>;
ti,x-plate-resistance = <200>;
- ti,coordiante-readouts = <5>;
+ ti,coordinate-readouts = <5>;
ti,wire-config = <0x00 0x11 0x22 0x33>;
ti,charge-delay = <0x400>;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread