aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/rmi4/rmi_bus.c
diff options
context:
space:
mode:
authorAndrew Duggan <aduggan@synaptics.com>2016-03-10 15:55:29 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-03-10 16:04:06 -0800
commitb43d2c1e9353814ce1716fff03d9223f40fa73b5 (patch)
treef97125db3487d4f61c633ee8080d2167637c898b /drivers/input/rmi4/rmi_bus.c
parentInput: synaptics-rmi4 - add device tree support for 2d sensors and F11 (diff)
downloadlinux-dev-b43d2c1e9353814ce1716fff03d9223f40fa73b5.tar.xz
linux-dev-b43d2c1e9353814ce1716fff03d9223f40fa73b5.zip
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 <aduggan@synaptics.com> Signed-off-by: Christopher Heiny <cheiny@synaptics.com> Tested-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4/rmi_bus.c')
-rw-r--r--drivers/input/rmi4/rmi_bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index 2e3878343961..a3d766118b61 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -309,6 +309,9 @@ static struct rmi_function_handler *fn_handlers[] = {
#ifdef CONFIG_RMI4_F11
&rmi_f11_handler,
#endif
+#ifdef CONFIG_RMI4_F12
+ &rmi_f12_handler,
+#endif
};
static void __rmi_unregister_function_handlers(int start_idx)