From: Linus Torvalds Date: Wed, 10 Jun 2020 20:51:47 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input X-Git-Tag: baikal/aarch64/sdk6.1~9111 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=d98a2f7e7e817dda6849f476eaccdabfe22d45d4;p=kernel.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: - a new driver for the Azoteq IQS269A capacitive touch controller - a new driver for the Cypress CY8CTMA140 touchscreen - updates to Elan and ft5x06 touchscreen drivers - assorted driver fixes - msm-vibrator has been removed as we have a more generic solution * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits) Input: adi - work around module name confict Input: iqs269a - add missing I2C dependency Input: elants - refactor elants_i2c_execute_command() Input: elants - override touchscreen info with DT properties Input: elants - remove unused axes Input: add support for Azoteq IQS269A dt-bindings: input: Add bindings for Azoteq IQS269A Input: imx_sc_key - use devm_add_action_or_reset() to handle all cleanups Input: remove msm-vibrator driver dt-bindings: Input: remove msm-vibrator Input: elants_i2c - provide an attribute to show calibration count Input: introduce input_mt_report_slot_inactive() dt-bindings: input: touchscreen: elants_i2c: convert to YAML Input: add driver for the Cypress CY8CTMA140 touchscreen dt-bindings: touchscreen: Add CY8CTMA140 bindings Input: edt-ft5x06 - prefer asynchronous probe Input: edt-ft5x06 - improve power management operations Input: edt-ft5x06 - move parameter restore into helper Input: edt-ft5x06 - fix get_default register write access Input: atkbd - receive and use physcode->keycode mapping from FW ... --- d98a2f7e7e817dda6849f476eaccdabfe22d45d4 diff --cc MAINTAINERS index 12dd77fb4e4e5,2c79dc3422f1f..9b4e836543a37 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4708,8 -4625,15 +4708,14 @@@ W: https://linuxtv.or W: http://palosaari.fi/linux/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/anttip/media_tree.git -S: Maintained F: drivers/media/common/cypress_firmware* + CYPRESS CY8CTMA140 TOUCHSCREEN DRIVER + M: Linus Walleij + L: linux-input@vger.kernel.org + S: Maintained + F: drivers/input/touchscreen/cy8ctma140.c + CYTTSP TOUCHSCREEN DRIVER M: Ferruh Yigit L: linux-input@vger.kernel.org