summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen (follow)
Commit message (Collapse)AuthorAge
* input: touchscreen: synaptics_dsx: Set power specificationsAlex Sarraf2016-04-27
| | | | | | | Set voltage and current specifications for LDOs. Change-Id: I6e666390ddbdd8128b6ebff8e2deb8c85cf35b21 Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
* input: synaptics_dsx_2.6: update driver to enable touch S332UMao Li2016-03-25
| | | | | | | | | | Synaptics reference driver V2.6 is being cleaned up to enable touch controller S332U. Add Kconfig and Makefile changes to enable Synaptics dsx V2.6 driver's compilation. CRs-Fixed: 943896 Change-Id: I7e79e9ee321b7a7c90d27f065281dc73cee65391 Signed-off-by: Mao Li <maol@codeaurora.org>
* input: gen_vkeys: squash commit from 3.14-kernelMohan Pallaka2016-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash and apply the following changes taken from the msm-3.14 kernel branch as of msm-3.14 commit 8139d0b4e7a6d ("ARM: dts: msm: Set flag to manage clks") commit c24a3df92a457643cc0821eb9e8f392ae5a907ee Author: Amy Maloche <amaloche@codeaurora.org> Date: Thu May 9 10:23:41 2013 -0700 input: gen_vkeys: Make y_offset an optional property Not all targets will need the y coordinate shifted to function properly, so set this value as default 0. Change-Id: I1816433c3601fe099ffb8ee275637e573990e432 Signed-off-by: Amy Maloche <amaloche@codeaurora.org> Documentation/devicetree/bindings/input/gen_vkeys.txt drivers/input/touchscreen/gen_vkeys.c 2 files changed, 13 insertions(+), 5 deletions(-) commit bb2ac18f8fab38fa12d8a7d8b7ee80d9c0049329 Author: Amy Maloche <amaloche@codeaurora.org> Date: Wed Apr 17 12:15:56 2013 -0700 vkeys: gen_vkeys: Add key position offset Add virtual key position offset to match virtual key positions with front panel. Change-Id: Ibbf89e816d9654f202b75470df0c673aa42439c8 Acked-by: Chun Zhang <chunz@qti.qualcomm.com> Signed-off-by: Amy Maloche <amaloche@codeaurora.org> Documentation/devicetree/bindings/input/gen_vkeys.txt drivers/input/touchscreen/gen_vkeys.c include/linux/input/gen_vkeys.h 3 files changed, 10 insertions(+), 2 deletions(-) commit 1a6d213cf5a3e40d8b39507e2b010dc81de63630 Author: Mohan Pallaka <mpallaka@codeaurora.org> Date: Wed Aug 8 11:25:52 2012 +0530 input: Add support for virtual key generation Virtual keys are used for navigation on Android. These are not specific to the controller used in the target but are specific to the target. Add a module to generate virtual keys independently of the controller. Change-Id: I0c86dc77f1bc53c283e990be419c2715edf4e1c0 Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org> Signed-off-by: Amy Maloche <amaloche@codeaurora.org> [stepanm@codeaurora.org: resolve Kconfig conflicts] Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org> .../devicetree/bindings/input/gen_vkeys.txt drivers/input/touchscreen/Kconfig drivers/input/touchscreen/Makefile drivers/input/touchscreen/gen_vkeys.c include/linux/input/gen_vkeys.h 5 files changed, 278 insertions(+) Change-Id: Ie0e14d201a42632af57ff23dc85cec8881125e5a Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
* input: synaptics: defer touch resume to workqueuezhaoyuan2016-03-23
| | | | | | | | | | | During device resume, the touch resume function is called after display resume. Touch resume function will take about >200ms. Defer the touch resume function to a workqueue to reduce the total device resume time. An optional DT property is added to enable this on targets that need this feature. Change-Id: Ia9b055144c5a7f29f0f0d57428cccbe15a7d7a87 Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
* input: synaptics_dsx_i2c: pass correct QUP Instance to scm callHimanshu Aggarwal2016-03-23
| | | | | | | | | Pass the correct QUP instance to the scm call. This is required for QUP ownership transfer to other subsystems to support the secure touch usecase. Change-Id: I3ff53544fc58db908669cddce155f786dde23c41 Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: synaptics_dsx: enter touch LPM in suspendMao Li2016-03-23
| | | | | | | | S332U needs to pull down the reset pin after it enters onto sleep mode to ensure the LPM is enabled. Change-Id: Ia8d8c1e788eb7d3524df979ad2d9e17ee15c26f2 Signed-off-by: Mao Li <maol@codeaurora.org>
* input: synaptics_dsx_i2c: add support for QUP ownership transferHimanshu Aggarwal2016-03-23
| | | | | | | | Add support for QUP ownership transfer to other subsystems to support the secure touch usecase. Change-Id: I70fd5fb81ce8763095bcfa2feb71d9d806d14bd4 Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: maxim_sti: add support for multitouch protocol BJigarkumar Kishorkumar Zala2016-03-23
| | | | | | | | Add support for multitouch procotol B, in order to track object based ID touch activities. Change-Id: I9b6941b3fea2f5c28434793073330cd4abe9fa74 Signed-off-by: Jigarkumar Kishorkumar Zala <j_zala@codeaurora.org>
* input: touchpanel: Add Synaptics latest version 2.6 touchpanel driverMao Li2016-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the reference driver source code for synaptics touch driver, the version is 2.6. All the new files are copied from the git commit: 7b6b9d126aca1f371e8abf3ae56d7a5a4e538f13 drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_active_pen.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_active_pen.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_core.h is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.h; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_fw_update.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_fw_update.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_gesture.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_gesture.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_i2c.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_i2c.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_proximity.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_proximity.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_rmi_dev.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_rmi_dev.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_rmi_hid_i2c.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_rmi_hid_i2c.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_spi.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_spi.c; drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_test_reporting.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_test_reporting.c drivers/input/touchscreen/synaptics_dsx_2.6/synaptics_dsx_video.c is copied from kernel/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_video.c include/linux/input/synaptics_dsx_v2_6.h is copied from kernel/include/linux/input/synaptics_dsx.h Change-Id: Ifda2c38ca5b4a82c3363d8c59ae9da3839568e82 Signed-off-by: Mao Li <maol@codeaurora.org>
* input: touchscreen: maxim_sti: remove SPI data swap in byteChun Zhang2016-03-23
| | | | | | | | | | | SPI bus driver did data swap to address big-little endian conversion. However, recent change in bus driver removes this conversion to align with hardware peripheral design. Therefore, touchscreen driver sets SPI bits per word to 16 in order to achieve best data transfer performance and remove this swap. Change-Id: Id24417e5afe055315b4c173961509aa7d6806034 Signed-off-by: Chun Zhang <chunz@codeaurora.org>
* drivers: atmel_maxtouch_ts: fix compilation errorsHimanshu Aggarwal2016-03-23
| | | | | | | Fix compilation errors when secure touch feature is enabled. Change-Id: I9efd1aee5b9615b065d556c4a19d6bf790221db1 Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: atmel_maxtouch_ts: squash commit from 3.14 kernelAmy Maloche2016-03-23
| | | | | | | | | | | | | | | | | | | | | | Squash and apply the following touchscreen changes taken from the msm-3.14 kernel branch as of msm-3.14 commit 8139d0b (ARM: dts: msm: Set flag to manage clks during suspend for msm8996) 421c2f3 input: touchscreen: atmel_maxtouch_ts: delay init call 48e0a07 input: atmel_maxtouch_ts: recover from bootloader b3ebb61 input: atmel_maxtouch_ts: add support for force cfg update 8467fe3 input: atmel_maxtouch_ts: fix firmware update routines c83ee59 input: atmel: Secure Touch support 1c7d5e2 input: atmel_maxtouch_ts: fix power up sequence d4c1ffc input: atmel_maxtouch_ts: add support to ignore CRC f402790 input: atmel_maxtouch_ts: add support for standard features 9374cef input: atmel_maxtouch_ts: use proper data types 0fbe83e input: atmel_maxtouch_ts: add regulator error conditions e22d100 input: atmel_maxtouch_ts: add gpio support 63d4b74 input: atmel_maxtouch_ts: add device tree support 575c2fc input: atmel_maxtouch_ts: enable compilation on 3.10 kenrel Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
* input: touchscreen: add Kconfig & Makefile entries for atmel_maxtouch_tsAmy Maloche2016-03-23
| | | | | | | | Add entries so compilation can be chosen for latest Atmel touchscreen driver. Change-Id: Ib63a56215e52cc80cb8532c50b16112d39c1e6f7 Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
* input: atmel_maxtouch_ts: Add latest Atmel driver supportNick Dyer2016-03-23
| | | | | | | | | | Git-commit: 482584a6c0d863e04a03837a79c1e79b2769aaee Git-repo: git://github.com/atmel-maxtouch/maxtouch-v3.0.git Change-Id: Ifdd872d1aacd5752aab1a218e18e2cbc1582c17f Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Signed-off-by: Amy Maloche <amaloche@codeaurora.org> [joshc: fixed up INIT_COMPLETION() usage] Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
* input: synaptics_dsx_core: clear all outstanding completionsHimanshu Aggarwal2016-03-23
| | | | | | | | | | The secure touch ISR and the poll logic in the user space layer is going out of sync because the completion lock in the driver is getting released in some corner cases unexpectedly. Clear all outstanding completions before waiting for one helps fix the issue. Change-Id: Ia3a6d318330263e7bfd8dfc3cea71c5300ab82b4 Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: synaptics_dsx: add reset in resume functionMao Li2016-03-23
| | | | | | | | Add reset in resume function to enable touch panel S332U for MSM8996 DTP. Change-Id: Id13ee3a8426cbd90692bc8a658f166c79accd7fd Signed-off-by: Mao Li <maol@codeaurora.org>
* input: synaptics_dsx_fw_update: modify firmware upgrade procedureHimanshu Aggarwal2016-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the firmware upgrade procedure based on the following requirements: If config id of the firmware file is greater than the config id in the device and if packrat id of the firmware img file is greater than the firmware build id in the device, then during the firmware upgrade procedure, both firmware and config areas are upgraded. Otherwise, if the packrat id of the firmware img file is equal to the firmware build id in the device, then only the config area is upgraded. However, if the packrat id of the firmware img file is lesser than the firmware build id in the device, then it is considered as an error. Similarly, if config id of the firmware file is equal to the config id in the device and if packrat id of the firmware img file is greater than the firmware build id in the device, then during the firmware upgrade procedure, both firmware and config areas are upgraded. Otherwise, if the packrat id of the firmware img file is equal to the firmware build id in the device, then no upgrade is needed. However, if the packrat id of the firmware img file is lesser than the firmware build id in the device, then it is considered as an error. This is a propagated patch from 3.10 kernel commit - d9921ff0ce4024b43837d794cc261b52ae58f776 , input: synaptics_dsx_fw_update: modify firmware upgrade procedure Change-Id: I646d2c04243a30b77d48698cce76e9e183bd6db1 Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: synaptics_dsx_fw_update: update fw based on config idHimanshu Aggarwal2016-03-23
| | | | | | | | | | | | | Update the firmware based on strict config ID versioning, rather than the entire config ID as a 4 byte number. This will also protect against config ID major number mismatches and packrat id mismatches. This is a propagated patch from 3.10 kernel. commit - 458cbab5c53d5141a66590441f9567d67d580c6f, input: synaptics_dsx_fw_update: update fw based on config id Change-Id: I1097585d3bd8b6ab753676dc56f268c7ce52680d Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: synaptics_dsx: Read touchscreen config-id during probeSudhakar Manapati2016-03-23
| | | | | | | | | | Add support for reading configuration ID from the touch controller during probe and print it. This is required to identify if touch controller is programmed with correct touch firmware or not. Change-Id: I155f0392ae67e5f9b184b9cef2a7bbb7666be30d Signed-off-by: Sudhakar Manapati <smanap@codeaurora.org> Signed-off-by: Himanshu Aggarwal <haggarwa@codeaurora.org>
* input: synaptics_dsx: correct the debug message errorAbinaya P2016-03-23
| | | | | | | | Parse the panel coordinates before using it for the debug message. Change-Id: I6e893b91e9f11cf7d80602058358d8256a96726d Signed-off-by: Abinaya P <abinayap@codeaurora.org>
* input: synaptics_dsx: squash commit from 3.14 kernelMohan Pallaka2016-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash and apply the following touchscreen changes taken from the msm-3.14 kernel branch as of msm-3.14 commit 3bc54cf86b (Merge "msm: camera: Add dummy sub module in sensor pipeline") b20792c2 input: synaptics_dsx: Fix security issues 4f3ec831 input: synaptics_dsx: Remove use of deprecated INIT_COMPLETION 8c5bd97f input: synaptics_dsx: change permission for sysfs secure_touch_enable b22c0b56 input: synaptics_dsx: reconfigure resolution in suspend 0ea26697 touchscreen: synaptics_dsx: set absolute axes for touchscreen 6a021e0a input: synaptics_dsx: handle all controller interrupts d3de3ed6 input: synaptics_dsx: remove query operation from reinit 2285a8dd input: synaptics_dsx: remove vkey kobject in remove 6817aed5 input: synaptics: Fix to secure touch clock unbalance 44a84a1e input: synaptics_dsx: support for pm ops 41439903 input: synaptics: add support for unprogrammed panels b029351d input: synaptics: remove outdated header d065c5e0 input: synaptics: add ability to distinguish touch part 72ca30da input: synaptics_dsx: release pinctrl resources on probe failure 0ab5f1e5 input: synaptics: add NULL pointer check ad4102c8 input: synaptics: Secure touch clocks 6a77bbed input: synaptics_dsx: fix compilation warning when !CONFIG_PM_* f3488933 input: synaptics_dsx: reorder device resume sequence 71b65447 input: synaptics_dsx: add support for 2D sensor for soft-keys 610ecdc2 input: synaptics_dsx: fix data sysfs read-write permission 06195779 input: synaptics_dsx: fix up world writable sysfs file 995ed76d input: synaptics_dsx: add ability to identify controller 69a416fe input: synaptic_dsx: configure touch panel boundary coordinates 609eb34b input: synaptics_dsx: correct sysfs permissions 59af5ffb input: synaptics_dsx: remove firmware update at boot 13b71e2f input: synaptic_dsx: stay awake the device during firmware update dccee682 input: synaptic_dsx: add sysfs entry for force firmware update a4d13992 input: synaptics: secure touch support 11c70731 input: synaptic_dsx: add debugfs support for suspend/resume 2642f2cb input: synaptics_dsx: add standard features for touch support 72f05e70 input: synaptics_dsx: add dual regulator support ab390caa input: synaptics_dsx: add device tree support 51898424 input: synaptics_dsx: fix conflicts with other drivers Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
* input: synaptics_dsx: Add support for synaptics_dsx touchAlexandra Chin2016-03-23
| | | | | | | | Change-Id: I1df8a7465fdb5c18cf69e0908347fc78ce7dd07c Git-commit: 67b7a9d78725d5de2a1899095eb0026e15343a62 Git-repo: git://github.com/synaptics-touch/synaptics-dsx-v2.1 Signed-off-by: Alexandra Chin <alexandra.chin@tw.synaptics.com> Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
* input: touchscreen: maxim_sti: set INPUT_PROP_DIRECT propertyJing Lin2016-03-23
| | | | | | | | Touchscreen is typical direct input device. Set the INPUT_PROP_DIRECT property to make sure that touch coordinates are mapped correctly. Change-Id: I398890c111a206baaca499d53e600a9de1d556bd Signed-off-by: Jing Lin <jinglin@codeaurora.org>
* input: maxim_sti: move header to uapiJing Lin2016-03-23
| | | | | | | | | | | | | Move kernel data structures to driver and keep the data structures shared between kernel and user space in the header file. Move the header to uapi to make it accesible to user space. Fix checkpatch errors to replace deprecated functions and hardcoded error return values. Change-Id: Ic3312c11ddda9f02da9807a6243206d582281995 Signed-off-by: Jing Lin <jinglin@codeaurora.org>
* input: maxim_sti: clean up the driverMohan Pallaka2016-03-23
| | | | | | | | Remove unnecessary macros and fix checkpatch errors. Fix of_* apis to parse gpios and add pinctrl support. Change-Id: I0ed7e31eb490ccf950e599469ff78338cae137d4 Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
* input: touchscreen: maxim_sti: driver updateKoushik Vishwamurthy2016-03-23
| | | | | | | | | | | branch specific modifications. Change-Id: Ie2b68cf91bb515428ea7e03ca379fb64bec8cc0a Git-commit: a8ffad52f8811651dbc60811923f6444998b6df2 Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/msm-3.10/log/?h=github-maxim_sti/A2 [jinglin@codeaurora.org: add subject line to commit text, remove Kbuild file] Signed-off-by: Jing Lin <jinglin@codeaurora.org>
* input: touchscreen: maxim_sti: initial commitKoushik Vishwamurthy2016-03-23
| | | | | | | | | | Maxim SmartTouch Imager Touchscreen driver added. Change-Id: Ia570d7afa09bc081df6d79cd7a2f432867113439 Git-commit: b223650ce7eae499cf1a3474ad9a7019e1e3edf1 Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/msm-3.10/log/?h=github-maxim_sti/A2 [jinglin@codeaurora.org: add subject line to commit text] Signed-off-by: Jing Lin <jinglin@codeaurora.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2015-12-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input fixes from Dmitry Torokhov: "Just a few assorted driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: elants_i2c - fix wake-on-touch Input: elan_i2c - set input device's vendor and product IDs Input: sun4i-lradc-keys - fix typo in binding documentation Input: atmel_mxt_ts - add maxtouch to I2C table for module autoload Input: arizona-haptic - fix disabling of haptics device Input: aiptek - fix crash on detecting device without endpoints Input: atmel_mxt_ts - add generic platform data for Chromebooks Input: parkbd - clear unused function pointers Input: walkera0701 - clear unused function pointers Input: turbografx - clear unused function pointers Input: gamecon - clear unused function pointers Input: db9 - clear unused function pointers
| * Input: elants_i2c - fix wake-on-touchJames Chen2015-12-18
| | | | | | | | | | | | | | | | | | | | When sending "SLEEP" command to the controller it ceases scanning completely and is unable to wake the system up from sleep, so if it is configured as a wakeup source we should simply configure interrupt for wakeup and rely on idle logic within the controller to reduce power consumption while it is not used. Signed-off-by: James Chen <james.chen@emc.com.tw> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| * Input: atmel_mxt_ts - add maxtouch to I2C table for module autoloadJavier Martinez Canillas2015-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Atmel maxtouch DT binding documents that the compatible string for the device is "atmel,maxtouch" and the I2C core always reports a module alias of the form i2c:alias where alias is the compatible string model: $ grep MODALIAS /sys/devices/platform/12e00000.i2c/i2c-8/8-004b/uevent MODALIAS=i2c:maxtouch But there isn't maxtouch entry in the I2C device ID table so when the i2c:maxtouch MODALIAS uevent is reported, kmod is not able to match the alias with a module to load: $ modinfo atmel_mxt_ts | grep alias alias: of:N*T*Catmel,maxtouch alias: i2c:mXT224 alias: i2c:atmel_mxt_tp alias: i2c:atmel_mxt_ts alias: i2c:qt602240_ts So add the maxtouch entry to the I2C device ID table to allow the module to be autoloaded when the device is registered via OF. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| * Input: atmel_mxt_ts - add generic platform data for ChromebooksDmitry Torokhov2015-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently people are installing generic Linux distributions not only on Pixels but also on other Chromebooks. Unfortunately on all of them Atmel parts assigned names ATML0000 and ATML0001, and do not carry any other configuration data. So let's create generic instance of platform data that should cover most of them (we assume that they will not be using T100 objects, since with those Google mapped BTN_LEFT onto a different GPIO, so slightly different keymap would be needed, but I think we used parts with T100 on ARM devices where we thankfully have DTS and can describe the devices better). Tested-by: Rich K <rgkirch@gmail.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2015-11-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull more input updates from Dmitry Torokhov: "An update to the tsc2005 driver that allows it to also support tsc2004 (basically the same controller, but uses i2c instead of spi bus), and a couple of bug fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: parkbd - drop bogus __init from parkbd_allocate_serio() Input: elantech - add Fujitsu Lifebook U745 to force crc_enabled Input: tsc2004 - add support for tsc2004 Input: tsc200x-core - rename functions and variables Input: tsc2005 - separate SPI and core functions
| * Merge branch 'next' into for-linusDmitry Torokhov2015-11-13
| |\ | | | | | | | | | Prepare second round of input updates for 4.3 merge window.
| | * Input: tsc2004 - add support for tsc2004Michael Welling2015-11-03
| | | | | | | | | | | | | | | | | | | | | | | | This adds support for the i2c based tsc2004 touchscreen controller. Signed-off-by: Michael Welling <mwelling@ieee.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: tsc200x-core - rename functions and variablesMichael Welling2015-11-03
| | | | | | | | | | | | | | | | | | | | | | | | The functions, variables, and defines of the new tsc200x-core.c are renamed to tsc200x instead of tsc2005 avoid possible confusion. Signed-off-by: Michael Welling <mwelling@ieee.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: tsc2005 - separate SPI and core functionsMichael Welling2015-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch separates the SPI functionality from core functionality that overlaps with the tsc2004. Prepares kernel for new tsc2004 driver without much redundant code. Signed-off-by: Michael Welling <mwelling@ieee.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2015-11-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: "Items of note: - evdev users can now limit or mask the kind of events they will receive. This will allow applications such as power manager or network manager to only be woken when user presses special keys such as KEY_POWER or KEY_WIFI and not be bothered with ordinary key presses coming from keyboard - support for FocalTech FT6236 touchscreen controller - support for ROHM BU21023/24 touchscreen controller - edt-ft5x06 touchscreen driver got a face lift and can now be used with FT5506 - support for Google Fiber TV Box remote controls - improvements in xpad driver (with more to come) - several parport-based drivers have been switched to the new device model - other miscellaneous driver improvements" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits) HID: hid-gfrm: avoid warning for input_configured API change HID: hid-input: allow input_configured callback return errors Input: evdev - fix bug in checking duplicate clock change request Input: add userio module Input: evdev - add event-mask API Input: snvs_pwrkey - remove duplicated semicolon HID: hid-gfrm: Google Fiber TV Box remote controls Input: e3x0-button - update Kconfig description Input: tegra-kbc - drop use of IRQF_NO_SUSPEND flag Input: tegra-kbc - enable support for the standard "wakeup-source" property Input: xen - check return value of xenbus_printf Input: hp_sdc_rtc - fix y2038 problem in proc_show Input: nomadik-ske-keypad - fix a trivial typo Input: xpad - fix clash of presence handling with LED setting Input: edt-ft5x06 - work around FT5506 firmware bug Input: edt-ft5x06 - add support for FT5506 Input: edt-ft5x06 - add support for different max support points Input: edt-ft5x06 - use max support points to determine how much to read Input: rotary-encoder - add support for quarter-period mode Input: rotary-encoder - use of_property_read_bool ...
| * | Merge branch 'next' into for-linusDmitry Torokhov2015-11-03
| |\| | | | | | | | | | Prepare first round of input updates for 4.3 merge window.
| | * Input: edt-ft5x06 - work around FT5506 firmware bugFranklin S Cooper Jr2015-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the touchscreen controller ISR, reading the tsc starting from register 0x2 causes the tsc to infrequently update the detected finger's x and y coordinate. The irq pin toggles at a fast rate to indicate touch events are happening. However, the tsc on average updates the touch point's x and y value every ~100 ms which is much slower than the advertised rate of 100+ Hz. This leads to multiple reads within this ~100 ms time window returning the same value. Example: X: 10 , Y: 30 X: 10 , Y: 30 X: 10, Y: 30 .. // After 100 ms X: 300, Y: 300 X: 300, y: 300 .. // After 100 ms X: 1743, Y: 621 X: 1743, Y: 621 For some reason if instead of starting to read at register 0x2 you start reading at register 0x0 this issue isn't seen. This seems like a quirk only seen in the EDT FT5506 so to fix this issue simply adjust the code to start reading from 0x0. Technically this isn't wrong so no regressions should be seen with other touchscreen controllers supported by this driver. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: edt-ft5x06 - add support for FT5506Franklin S Cooper Jr2015-10-16
| | | | | | | | | | | | | | | | | | | | | FT5506 is essentially the same as other FT5x06 devices other than supporting 10 support points. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: edt-ft5x06 - add support for different max support pointsFranklin S Cooper Jr2015-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the code so that the maximum supported points aren't hard coded but can be changed. Set the maximum support points based on the data passed along side the compatible field. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: edt-ft5x06 - use max support points to determine how much to readFranklin S Cooper Jr2015-10-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Calculate the amount of data that needs to be read for the specified max number of support points. If the maximum number of support points changes then the amount that is read from the touch screen controller should reflect this. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: pixcir_i2c_ts - remove wakeirq related code from pixcir driverVignesh R2015-10-13
| | | | | | | | | | | | | | | | | | | | | | | | With commit 3fffd1283927 ("i2c: allow specifying separate wakeup interrupt in device tree") wakeirq is managed by i2c-core, so remove wakeirq related code from pixcir_i2c_ts driver. Signed-off-by: Vignesh R <vigneshr@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: ft6236 - change module license string to match copyright noticeDmitry Torokhov2015-10-10
| | | | | | | | | | | | | | | | | | The copyright/license notice says that the code is licensed under GPL v2 only (not GPL v2+), so let's use proper string in MODULE_LICENSE(). Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: ft6236 - do not explicitly set driver's ownerFengguang Wu2015-10-06
| | | | | | | | | | | | | | | | | | | | | There is no need to explicitly set .owner for the driver, the core will do it for us. Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: edt-ft5x06 - do not call desc_to_gpio for invalid gpiosFranklin S Cooper Jr2015-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since reset and wake pin are optional the gpio structure for those pins may be null. Therefore, they can't be blindly passed to desc_to_gpio. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Input: add support for ROHM BU21023/24 touchscreenYoichi Yuasa2015-10-05
| | | | | | | | | | | | | | | | | | | | | This adds support for ROHM BU21023/24 Dual touch resistive touchscreens. Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * Merge tag 'v4.3-rc4' into nextDmitry Torokhov2015-10-05
| | |\ | | | | | | | | | | | | Merge with mainline to sync up with changes to parkbd driver.
| | * | Input: add support for FocalTech FT6236 touchscreen controllerNoralf Trønnes2015-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the FT6x06 and the FT6x36 family of capacitive touch panel controllers, in particular the FT6236. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| | * | Input: cyttsp - use PTR_ERR_OR_ZERO()Javier Martinez Canillas2015-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PTR_ERR_OR_ZERO() helper function checks if a pointer contains an errno code and returns it or return 0 if that's not the case. Use the helper instead of open coding the same logic in the driver. This was found with make coccicheck that complains with the following warning: drivers/input/touchscreen/cyttsp4_i2c.c:53:1-3: WARNING: PTR_ERR_OR_ZERO can be used Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-24 21:28:24 +0000