summaryrefslogtreecommitdiffstats
path: root/include/linux/rmi.h
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-11-22 17:57:02 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-11-22 17:59:25 -0800
commitc762cc68b6a12eedebefc156ea4838e54804e2eb (patch)
treeb5e6e92723464430f094fb6951b23bbdb10a217f /include/linux/rmi.h
parent6adba43fd222ea362c36296d1a6897c2e28fdc8e (diff)
downloadlinux-c762cc68b6a12eedebefc156ea4838e54804e2eb.tar.gz
linux-c762cc68b6a12eedebefc156ea4838e54804e2eb.tar.bz2
linux-c762cc68b6a12eedebefc156ea4838e54804e2eb.zip
Input: synaptics-rmi4 - propagate correct number of rx and tx electrodes to F54
F54 diagnostics report functions provide data based on the number of enabled rx and tx electrodes, which is not identical to the number of electrodes reported with F54:Query0 and F54:Query1. Those values report the number of supported electrodes, not the number of enabled electrodes. The number of enabled electrodes can be determined by analyzing F55:Ctrl1 (sensor receiver assignment) and F55:Ctrl2 (sensor transmitter assignment). Propagate the number of enabled electrodes from F55 to F54 to avoid corrupted output if not all electrodes are enabled. Fixes: 3a762dbd5347 ("[media] Input: synaptics-rmi4 - add support for F54 ...") Signed-off-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Nick Dyer <nick@shmanahar.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'include/linux/rmi.h')
-rw-r--r--include/linux/rmi.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/rmi.h b/include/linux/rmi.h
index 4096b0246c23..8499b6aa2221 100644
--- a/include/linux/rmi.h
+++ b/include/linux/rmi.h
@@ -354,6 +354,9 @@ struct rmi_driver_data {
u8 pdt_props;
u8 bsr;
+ u8 num_rx_electrodes;
+ u8 num_tx_electrodes;
+
bool enabled;
void *data;