| From b4c807b11f8688dc42d4f14aed342877f80c74d2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 12 Dec 2021 21:14:48 -0800 |
| Subject: Input: ti_am335x_tsc - fix STEPCONFIG setup for Z2 |
| |
| From: Dario Binacchi <dariobin@libero.it> |
| |
| [ Upstream commit 6bfeb6c21e1bdc11c328b7d996d20f0f73c6b9b0 ] |
| |
| 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: 8c896308feae ("input: ti_am335x_adc: use only FIFO0 and clean up a little") |
| Signed-off-by: Dario Binacchi <dariobin@libero.it> |
| Link: https://lore.kernel.org/r/20211212125358.14416-3-dariobin@libero.it |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 fd3ffdd23470b..cfc943423241f 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.34.1 |
| |
