Skip to content

Commit b43d2c1

Browse files
aduggan-synadtor
authored andcommitted
Input: synaptics-rmi4 - add support for F12
Function 12 implements 2D touch position sensor for newer Synaptics touch devices. It replaces F11 and no device will contain both functions. Signed-off-by: Andrew Duggan <[email protected]> Signed-off-by: Christopher Heiny <[email protected]> Tested-by: Benjamin Tissoires <[email protected]> Tested-by: Linus Walleij <[email protected]> Tested-by: Bjorn Andersson <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent aaa2798 commit b43d2c1

File tree

5 files changed

+473
-0
lines changed

5 files changed

+473
-0
lines changed

drivers/input/rmi4/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,14 @@ config RMI4_F11
3232
Function 11 provides 2D multifinger pointing for touchscreens and
3333
touchpads. For sensors that support relative pointing, F11 also
3434
provides mouse input.
35+
36+
config RMI4_F12
37+
bool "RMI4 Function 12 (2D pointing)"
38+
select RMI4_2D_SENSOR
39+
depends on RMI4_CORE
40+
help
41+
Say Y here if you want to add support for RMI4 function 12.
42+
43+
Function 12 provides 2D multifinger pointing for touchscreens and
44+
touchpads. For sensors that support relative pointing, F12 also
45+
provides mouse input.

drivers/input/rmi4/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ rmi_core-$(CONFIG_RMI4_2D_SENSOR) += rmi_2d_sensor.o
55

66
# Function drivers
77
rmi_core-$(CONFIG_RMI4_F11) += rmi_f11.o
8+
rmi_core-$(CONFIG_RMI4_F12) += rmi_f12.o
89

910
# Transports
1011
obj-$(CONFIG_RMI4_I2C) += rmi_i2c.o

drivers/input/rmi4/rmi_bus.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ static struct rmi_function_handler *fn_handlers[] = {
309309
#ifdef CONFIG_RMI4_F11
310310
&rmi_f11_handler,
311311
#endif
312+
#ifdef CONFIG_RMI4_F12
313+
&rmi_f12_handler,
314+
#endif
312315
};
313316

314317
static void __rmi_unregister_function_handlers(int start_idx)

drivers/input/rmi4/rmi_driver.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,5 @@ char *rmi_f01_get_product_ID(struct rmi_function *fn);
100100

101101
extern struct rmi_function_handler rmi_f01_handler;
102102
extern struct rmi_function_handler rmi_f11_handler;
103+
extern struct rmi_function_handler rmi_f12_handler;
103104
#endif

0 commit comments

Comments
 (0)