aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-05-10 11:40:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-05-10 11:40:35 -0700
commit14e0c7317ed58bcd15af5c3d09818ee0f2e3984c (patch)
treef9b63dc681574484c23c6b01be81f17cf9c64d6a /drivers/input/keyboard/Kconfig
parentInput: synaptics-rmi4 - write config register values to the right offset (diff)
parentInput: libps2 - mark expected switch fall-through (diff)
downloadlinux-dev-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.tar.xz
linux-dev-14e0c7317ed58bcd15af5c3d09818ee0f2e3984c.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.2 merge window.
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
-rw-r--r--drivers/input/keyboard/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 52d7f55fca32..1fe039d7326b 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -137,6 +137,17 @@ config KEYBOARD_ATKBD_RDI_KEYCODES
right-hand column will be interpreted as the key shown in the
left-hand column.
+config KEYBOARD_QT1050
+ tristate "Microchip AT42QT1050 Touch Sensor Chip"
+ depends on I2C
+ select REGMAP_I2C
+ help
+ Say Y here if you want to use Microchip AT42QT1050 QTouch
+ Sensor chip as input device.
+
+ To compile this driver as a module, choose M here:
+ the module will be called qt1050
+
config KEYBOARD_QT1070
tristate "Atmel AT42QT1070 Touch Sensor Chip"
depends on I2C