Skip to contentSkip to conversation

input: touchscreen: ti_am335x_tsc: Fix incorrect step config for 5 wire touchscreen

PATCH Applied Vignesh R 3 participants 4 messages Sep 19, 2017 – Oct 19, 2017

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Vignesh R

author
#0 lore raw

PATCH 1/1 input: touchscreen: ti_am335x_tsc: Fix incorrect step config for 5 wire touchscreen

From: Jeff Lance <[email protected]>

Step config setting for 5 wire touchscreen is incorrect for Y coordinates. It was broken while we moved to DT. If you look close at the offending commit bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable"), the change was:

- STEPCONFIG_XNP | STEPCONFIG_YPN;
+ ts_dev->bit_xn | ts_dev->bit_yp;

while bit_xn = STEPCONFIG_XNN and bit_yp = STEPCONFIG_YNN. Not quite the same.

Fixes bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable")
Signed-off-by Jeff Lance <[email protected]>
[[email protected]: Rebase to v4.14-rc1]
Signed-off-by Vignesh R <[email protected]>

---

Tested on AM335x EVM with 5 wire tsc module. Also sanity tested on a 4 wire tsc as well.

 drivers/input/touchscreen/ti_am335x_tsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +1 -1
index 7953381d939a..f1043ae71dcc 100644
@@ -161,7 +161,7 @@ static void titsc_step_config(struct titsc *ts_dev)
 		break;
 	case 5:
 		config |= ts_dev->bit_xp | STEPCONFIG_INP_AN4 |
-				ts_dev->bit_xn | ts_dev->bit_yp;
+				STEPCONFIG_XNP | STEPCONFIG_YPN;
 		break;
 	case 8:
 		config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
Signature · 1 line
2.14.1
author
#1 lore raw
Quoted 10 lines · Vignesh R

From: Jeff Lance <[email protected]>

Step config setting for 5 wire touchscreen is incorrect for Y coordinates. It was broken while we moved to DT. If you look close at the offending commit bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable"), the change was:

- STEPCONFIG_XNP | STEPCONFIG_YPN;
+ ts_dev->bit_xn | ts_dev->bit_yp;

Quoted 9 lines

while bit_xn = STEPCONFIG_XNN and bit_yp = STEPCONFIG_YNN. Not quite the same.

Fixes bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable")
Signed-off-by Jeff Lance <[email protected]>
[[email protected]: Rebase to v4.14-rc1]
Signed-off-by Vignesh R <[email protected]>

---

Gentle ping...

Quoted 20 lines

Tested on AM335x EVM with 5 wire tsc module. Also sanity tested on a 4 wire tsc as well.

 drivers/input/touchscreen/ti_am335x_tsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +1 -1
index 7953381d939a..f1043ae71dcc 100644
@@ -161,7 +161,7 @@ static void titsc_step_config(struct titsc *ts_dev)
 		break;
 	case 5:
 		config |= ts_dev->bit_xp | STEPCONFIG_INP_AN4 |
-				ts_dev->bit_xn | ts_dev->bit_yp;
+				STEPCONFIG_XNP | STEPCONFIG_YPN;
 		break;
 	case 8:
 		config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
Signature · 2 lines
Regards
Vignesh
#2 lore raw
In reply to Vignesh R

Hi

Quoted 30 lines · Vignesh R

From: Jeff Lance <[email protected]>

Step config setting for 5 wire touchscreen is incorrect for Y coordinates. It was broken while we moved to DT. If you look close at the offending commit bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable"), the change was:

- STEPCONFIG_XNP | STEPCONFIG_YPN;
+ ts_dev->bit_xn | ts_dev->bit_yp;

while bit_xn = STEPCONFIG_XNN and bit_yp = STEPCONFIG_YNN. Not quite the same.

Fixes bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable")
Signed-off-by Jeff Lance <[email protected]>
[[email protected]: Rebase to v4.14-rc1]
Signed-off-by Vignesh R <[email protected]>

---

Tested on AM335x EVM with 5 wire tsc module. Also sanity tested on a 4 wire tsc as well.

 drivers/input/touchscreen/ti_am335x_tsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/ti_am335x_tsc.c +0 -0
index 7953381d939a..f1043ae71dcc 100644

drivers/input/touchscreen/ti_am335x_tsc.c static void titsc_step_config(struct titsc *ts_dev)

Quoted 9 lines
drivers/input/touchscreen/ti_am335x_tsc.c +1 -2
@@ -161,7 +161,7 @@ static void titsc_step_config(struct titsc *ts_dev)
                break;
        case 5:
                config |= ts_dev->bit_xp | STEPCONFIG_INP_AN4 |
-                               ts_dev->bit_xn | ts_dev->bit_yp;
+                               STEPCONFIG_XNP | STEPCONFIG_YPN;
                break;
        case 8:
                config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
--

Looks sane to me.

Michael

Quoted 6 lines

2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer Applied
#3 lore raw
Quoted 28 lines · Michael Nazzareno Trimarchi

Hi

Quoted 25 lines · Vignesh R

From: Jeff Lance <[email protected]>

Step config setting for 5 wire touchscreen is incorrect for Y coordinates. It was broken while we moved to DT. If you look close at the offending commit bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable"), the change was:

- STEPCONFIG_XNP | STEPCONFIG_YPN;
+ ts_dev->bit_xn | ts_dev->bit_yp;

while bit_xn = STEPCONFIG_XNN and bit_yp = STEPCONFIG_YNN. Not quite the same.

Fixes bb76dc09ddfc ("input: ti_am33x_tsc: Order of TSC wires, made configurable")
Signed-off-by Jeff Lance <[email protected]>
[[email protected]: Rebase to v4.14-rc1]
Signed-off-by Vignesh R <[email protected]>

---

Tested on AM335x EVM with 5 wire tsc module. Also sanity tested on a 4 wire tsc as well.

 drivers/input/touchscreen/ti_am335x_tsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 5 lines
drivers/input/touchscreen/ti_am335x_tsc.c +0 -0
index 7953381d939a..f1043ae71dcc 100644

drivers/input/touchscreen/ti_am335x_tsc.c static void titsc_step_config(struct titsc *ts_dev)

Quoted 9 lines
drivers/input/touchscreen/ti_am335x_tsc.c +1 -2
@@ -161,7 +161,7 @@ static void titsc_step_config(struct titsc *ts_dev)
                break;
        case 5:
                config |= ts_dev->bit_xp | STEPCONFIG_INP_AN4 |
-                               ts_dev->bit_xn | ts_dev->bit_yp;
+                               STEPCONFIG_XNP | STEPCONFIG_YPN;
                break;
        case 8:
                config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
--

Looks sane to me.

Applied, thank you.

Quoted 9 lines

Michael

Quoted 6 lines

2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
Dmitry