* [PATCH v2 0/4] input: touchscreen: am335x: fix and improvements
@ 2021-11-25 22:46 Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 1/4] input: ti_am335x_tsc: set ADCREFM for X configuration Dario Binacchi
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Dario Binacchi @ 2021-11-25 22:46 UTC (permalink / raw)
To: linux-kernel
Cc: Sebastian Andrzej Siewior, linux-input, Felipe Balbi,
Zubair Lutfullah, Grygorii Strashko, Dmitry Torokhov,
Dave Gerlach, Andrew F . Davis, Vignesh R, Lee Jones,
Wolfram Sang, Brad Griffis, Jeff Lance, Rachna Patil,
Dario Binacchi
This series grew out of a touchscreen validation activity on a custom
board. Oscilloscope measurements and driver source analysis led to these
patches.
Changes in v2:
- Rebase the series onto v5.16-rc2
- Replace CNTRLREG_8WIRE with CNTRLREG_TSC_8WIRE. In the meantime, the
file ti_am335x_tscadc.h has been modified, so the patch must be
updated.
- Drop patch 4/6 ("dt-bindings: input: ti-tsc-adc: fix tsc node example")
- Drop patch 5/6 ("mfd: ti_am335x_tscadc: fix reading a tsc property from DT")
Dario Binacchi (4):
input: ti_am335x_tsc: set ADCREFM for X configuration
input: ti_am335x_tsc: fix STEPCONFIG setup for Z2
input: ti_am335x_tsc: lower the X and Y sampling time
mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro
drivers/input/touchscreen/ti_am335x_tsc.c | 18 +++++++++++++-----
include/linux/mfd/ti_am335x_tscadc.h | 1 -
2 files changed, 13 insertions(+), 6 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/4] input: ti_am335x_tsc: set ADCREFM for X configuration
2021-11-25 22:46 [PATCH v2 0/4] input: touchscreen: am335x: fix and improvements Dario Binacchi
@ 2021-11-25 22:46 ` Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 2/4] 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-11-25 22:46 UTC (permalink / raw)
To: linux-kernel
Cc: Sebastian Andrzej Siewior, linux-input, Felipe Balbi,
Zubair Lutfullah, Grygorii Strashko, Dmitry Torokhov,
Dave Gerlach, Andrew F . Davis, Vignesh R, Lee Jones,
Wolfram Sang, Brad Griffis, Jeff Lance, Rachna Patil,
Dario Binacchi
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>
---
(no changes since v1)
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 v2 2/4] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2
2021-11-25 22:46 [PATCH v2 0/4] input: touchscreen: am335x: fix and improvements Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 1/4] input: ti_am335x_tsc: set ADCREFM for X configuration Dario Binacchi
@ 2021-11-25 22:46 ` Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 3/4] input: ti_am335x_tsc: lower the X and Y sampling time Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 4/4] mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro Dario Binacchi
3 siblings, 0 replies; 6+ messages in thread
From: Dario Binacchi @ 2021-11-25 22:46 UTC (permalink / raw)
To: linux-kernel
Cc: Sebastian Andrzej Siewior, linux-input, Felipe Balbi,
Zubair Lutfullah, Grygorii Strashko, Dmitry Torokhov,
Dave Gerlach, Andrew F . Davis, Vignesh R, Lee Jones,
Wolfram Sang, Brad Griffis, Jeff Lance, Rachna Patil,
Dario Binacchi
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>
---
(no changes since v1)
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 v2 3/4] input: ti_am335x_tsc: lower the X and Y sampling time
2021-11-25 22:46 [PATCH v2 0/4] input: touchscreen: am335x: fix and improvements Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 1/4] input: ti_am335x_tsc: set ADCREFM for X configuration Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 2/4] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2 Dario Binacchi
@ 2021-11-25 22:46 ` Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 4/4] mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro Dario Binacchi
3 siblings, 0 replies; 6+ messages in thread
From: Dario Binacchi @ 2021-11-25 22:46 UTC (permalink / raw)
To: linux-kernel
Cc: Sebastian Andrzej Siewior, linux-input, Felipe Balbi,
Zubair Lutfullah, Grygorii Strashko, Dmitry Torokhov,
Dave Gerlach, Andrew F . Davis, Vignesh R, Lee Jones,
Wolfram Sang, Brad Griffis, Jeff Lance, Rachna Patil,
Dario Binacchi
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>
---
(no changes since v1)
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 v2 4/4] mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro
2021-11-25 22:46 [PATCH v2 0/4] input: touchscreen: am335x: fix and improvements Dario Binacchi
` (2 preceding siblings ...)
2021-11-25 22:46 ` [PATCH v2 3/4] input: ti_am335x_tsc: lower the X and Y sampling time Dario Binacchi
@ 2021-11-25 22:46 ` Dario Binacchi
2021-11-26 8:58 ` Lee Jones
3 siblings, 1 reply; 6+ messages in thread
From: Dario Binacchi @ 2021-11-25 22:46 UTC (permalink / raw)
To: linux-kernel
Cc: Sebastian Andrzej Siewior, linux-input, Felipe Balbi,
Zubair Lutfullah, Grygorii Strashko, Dmitry Torokhov,
Dave Gerlach, Andrew F . Davis, Vignesh R, Lee Jones,
Wolfram Sang, Brad Griffis, Jeff Lance, Rachna Patil,
Dario Binacchi
In TI's reference manual description for the `AFE_Pen_Ctrl' bit-field
of the TSC's CTRL register, there is no mention of 8-wire touchscreens.
Even commit f0933a60d190 ("mfd: ti_am335x_tscadc: Update logic in CTRL
register for 5-wire TS") says that the value of this bit-field must be
the same for 4-wire and 8-wire touchscreens. So let's remove the
CNTRLREG_TSC_8WIRE macro to avoid misunderstandings.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
Changes in v2:
- Replace CNTRLREG_8WIRE with CNTRLREG_TSC_8WIRE. In the meantime, the
file ti_am335x_tscadc.h has been modified, so the patch must be
updated.
include/linux/mfd/ti_am335x_tscadc.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index ba13e043d910..4063b0614d90 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -103,7 +103,6 @@
#define CNTRLREG_TSC_AFE_CTRL(val) FIELD_PREP(GENMASK(6, 5), (val))
#define CNTRLREG_TSC_4WIRE CNTRLREG_TSC_AFE_CTRL(1)
#define CNTRLREG_TSC_5WIRE CNTRLREG_TSC_AFE_CTRL(2)
-#define CNTRLREG_TSC_8WIRE CNTRLREG_TSC_AFE_CTRL(3)
#define CNTRLREG_TSC_ENB BIT(7)
/*Control registers bitfields for MAGADC IP */
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 4/4] mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro
2021-11-25 22:46 ` [PATCH v2 4/4] mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro Dario Binacchi
@ 2021-11-26 8:58 ` Lee Jones
0 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2021-11-26 8:58 UTC (permalink / raw)
To: Dario Binacchi
Cc: linux-kernel, Sebastian Andrzej Siewior, linux-input,
Felipe Balbi, Zubair Lutfullah, Grygorii Strashko,
Dmitry Torokhov, Dave Gerlach, Andrew F . Davis, Vignesh R,
Wolfram Sang, Brad Griffis, Jeff Lance, Rachna Patil
On Thu, 25 Nov 2021, Dario Binacchi wrote:
> In TI's reference manual description for the `AFE_Pen_Ctrl' bit-field
> of the TSC's CTRL register, there is no mention of 8-wire touchscreens.
> Even commit f0933a60d190 ("mfd: ti_am335x_tscadc: Update logic in CTRL
> register for 5-wire TS") says that the value of this bit-field must be
> the same for 4-wire and 8-wire touchscreens. So let's remove the
> CNTRLREG_TSC_8WIRE macro to avoid misunderstandings.
>
> Signed-off-by: Dario Binacchi <dariobin@libero.it>
>
> ---
>
> Changes in v2:
> - Replace CNTRLREG_8WIRE with CNTRLREG_TSC_8WIRE. In the meantime, the
> file ti_am335x_tscadc.h has been modified, so the patch must be
> updated.
>
> include/linux/mfd/ti_am335x_tscadc.h | 1 -
> 1 file changed, 1 deletion(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-26 9:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-25 22:46 [PATCH v2 0/4] input: touchscreen: am335x: fix and improvements Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 1/4] input: ti_am335x_tsc: set ADCREFM for X configuration Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 2/4] input: ti_am335x_tsc: fix STEPCONFIG setup for Z2 Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 3/4] input: ti_am335x_tsc: lower the X and Y sampling time Dario Binacchi
2021-11-25 22:46 ` [PATCH v2 4/4] mfd: ti_am335x_tscadc: drop the CNTRLREG_TSC_8WIRE macro Dario Binacchi
2021-11-26 8:58 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).