summaryrefslogtreecommitdiff
path: root/include/linux/input (follow)
Commit message (Collapse)AuthorAge
* 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: 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: 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: 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_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: 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: 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>
* Input: edt-ft5x06 - remove support for platform dataDmitry Torokhov2015-09-27
| | | | | | | | We do not have any users of platform data in the tree and all newer platforms are either DT or ACPI, so let's drop handling of platform data. Tested-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: edt-ft5x06 - switch to newer gpio frameworkFranklin S Cooper Jr2015-09-27
| | | | | | | | | | | | | | | The current/old gpio framework used doesn't properly listen to ACTIVE_LOW and ACTIVE_HIGH flags. The newer gpio framework takes into account these flags when setting gpio values. Since the values being output were based on voltage and not logic they change to reflect this difference. Also use gpiod_set_value_cansleep since wake and reset pins can be provided by bus based io expanders. Switch from msleep(5) to udelay_range(5000,6000) to avoid check patch warning. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: pixcir_i2c_ts - move platform dataDmitry Torokhov2015-07-11
| | | | | | | | | Let's move driver's platform data definitions from include/linux/input/ into include/linux/platform_data/ so that it stays with the rest of platform data definitions. Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: of_touchscreen - switch to using device propertiesDmitry Torokhov2015-07-11
| | | | | | | | Let's switch form OF to device properties so that common parsing code could work not only on device tree but also on ACPI-based platforms. Reviewed-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: improve parsing OF parameters for touchscreensDmitry Torokhov2015-06-25
| | | | | | | | | | When applying touchscreen parameters specified in device tree let's make sure we keep whatever setup was done by the driver and not reset the missing values to zero. Reported-by: Pavel Machek <pavel@ucw.cz> Tested-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: MT - add support for balanced slot assignmentHenrik Rydberg2015-02-01
| | | | | | | | | | | | | | | | | Some devices are not fast enough to differentiate between a fast-moving contact and a new contact. This problem cannot be fully resolved because information is truly missing, but it is possible to safe-guard against obvious mistakes by restricting movement with a maximum displacement. The new problem formulation for dmax > 0 cannot benefit from the speedup for positive definite matrices, but since the convergence is faster, the result is about the same. For a handful of contacts, the latency difference is truly negligible. Suggested-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Tested-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Henrik Rydberg <rydberg@bitmath.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: MT - make slot cleanup callable outside mt_sync_frame()Henrik Rydberg2014-08-07
| | | | | | | | | | Some semi-mt drivers use the slots in a manual way, but may still want to call parts of the frame synchronization logic. This patch makes input_mt_drop_unused callable from those drivers. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Reviewed-by: Benson Leung <bleung@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: pixcir_i2c_ts - support up to 5 fingers and hardware tracking IDsRoger Quadros2014-07-28
| | | | | | | | Some variants of the Pixcir touch controller support up to 5 simultaneous fingers and hardware tracking IDs. Prepare the driver for that. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: add common DT binding for touchscreensSebastian Reichel2014-05-29
| | | | | | | | | | | | | | Add common DT binding documentation for touchscreen devices and implement input_parse_touchscreen_of_params, which parses the common properties and configures the input device accordingly. The method currently does not interpret the axis inversion properties, since there is no matching flag in the generic linux input device. Reviewed-by: Pavel Machek <pavel@ucw.cz> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: pixcir_i2c_ts - get rid of pdata->attb_read_val()Roger Quadros2014-05-18
| | | | | | | | | | | Get rid of the attb_read_val() platform hook. Instead, read the ATTB gpio directly from the driver. Fail if valid ATTB gpio is not provided by patform data. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: pixcir_i2c_ts - initialize interrupt mode and power modeRoger Quadros2014-05-18
| | | | | | | | | | | | | Introduce helper functions to configure power and interrupt registers. Default to IDLE mode on probe as device supports auto wakeup to ACVIE mode on detecting finger touch. Configure interrupt mode and polarity on start up. Power down on device closure or module removal. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: pmic8xxx-pwrkey - migrate to DTStephen Boyd2014-03-30
| | | | | | | | The driver is only supported on DT enabled platforms. Convert the driver to DT so that it can probe properly. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Input: pmic8xxx-keypad - migrate to DTStephen Boyd2014-03-30
| | | | | | | | The driver is only supported on DT enabled platforms. Convert the driver to DT so that it can probe properly. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* Merge tag 'mfd-3.11-1' of ↵Linus Torvalds2013-07-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next Pull MFD update from Samuel Ortiz: "For the 3.11 merge we only have one new MFD driver for the Kontron PLD. But we also have: - Support for the TPS659038 PMIC from the palmas driver. - Intel's Coleto Creek and Avoton SoCs support from the lpc_ich driver. - RTL8411B support from the rtsx driver. - More DT support for the Arizona, max8998, twl4030-power and the ti_am335x_tsadc drivers. - The SSBI driver move under MFD. - A conversion to the devm_* API for most of the MFD drivers. - The twl4030-power got split from twl-core into its own module. - A major ti_am335x_adc cleanup, leading to a proper DT support. - Our regular arizona and wm* updates and cleanups from the Wolfson folks. - A better error handling and initialization, and a regulator subdevice addition for the 88pm80x driver. - A bulk platform_set_drvdata() call removal that's no longer need since commit 0998d0631001 ("device-core: Ensure drvdata = NULL when no driver is bound") * tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (102 commits) mfd: sec: Provide max_register to regmap mfd: wm8994: Remove duplicate check for active JACKDET MAINTAINERS: Add include directory to MFD file patterns mfd: sec: Remove fields not used since regmap conversion watchdog: Kontron PLD watchdog timer driver mfd: max8998: Add support for Device Tree regulator: max8998: Use arrays for specifying voltages in platform data mfd: max8998: Add irq domain support regulator: palmas: Add TPS659038 support mfd: Kontron PLD mfd driver mfd: palmas: Add TPS659038 PMIC support mfd: palmas: Add SMPS10_BOOST feature mfd: palmas: Check if irq is valid mfd: lpc_ich: iTCO_wdt patch for Intel Coleto Creek DeviceIDs mfd: twl-core: Change TWL6025 references to TWL6032 mfd: davinci_voicecodec: Fix build breakage mfd: vexpress: Make the driver optional for arm and arm64 mfd: htc-egpio: Use devm_ioremap_nocache() instead of ioremap_nocache() mfd: davinci_voicecodec: Convert to use devm_* APIs mfd: twl4030-power: Fix relocking on error ...
| * input: mfd: ti_am335x_tsc remove remaining platform data piecesSebastian Andrzej Siewior2013-06-12
| | | | | | | | | | | | | | The two header files removed here are unused and have no users as this platform was never used with platform devices. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| * input: ti_am33x_tsc: Order of TSC wires, made configurablePatil, Rachna2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | The current driver expected touchscreen input wires(XP,XN,YP,YN) to be connected in a particular order. Making changes to accept this as platform data. Sebastian reworked the original patch and removed a lot of the not required pieces. Signed-off-by: Patil, Rachna <rachna@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
* | Merge branch 'next' into for-linusDmitry Torokhov2013-07-02
|\| | | | | | | Prepare first set of updates for 3.11 merge window.
| * Merge tag 'mfd-3.10-1' of ↵Linus Torvalds2013-05-05
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next Pull MFD update from Samuel Ortiz: "For 3.10 we have a few new MFD drivers for: - The ChromeOS embedded controller which provides keyboard, battery and power management services. This controller is accessible through i2c or SPI. - Silicon Laboratories 476x controller, providing access to their FM chipset and their audio codec. - Realtek's RTS5249, a memory stick, MMC and SD/SDIO PCI based reader. - Nokia's Tahvo power button and watchdog device. This device is very similar to Retu and is thus supported by the same code base. - STMicroelectronics STMPE1801, a keyboard and GPIO controller supported by the stmpe driver. - ST-Ericsson AB8540 and AB8505 power management and voltage converter controllers through the existing ab8500 code. Some other drivers got cleaned up or improved. In particular: - The Linaro/STE guys got the ab8500 driver in sync with their internal code through a series of optimizations, fixes and improvements. - The AS3711 and OMAP USB drivers now have DT support. - The arizona clock and interrupt handling code got improved. - The wm5102 register patch and boot mechanism also got improved." * tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (104 commits) mfd: si476x: Don't use 0bNNN mfd: vexpress: Handle pending config transactions mfd: ab8500: Export ab8500_gpadc_sw_hw_convert properly mfd: si476x: Fix i2c warning mfd: si476x: Add header files and Kbuild plumbing mfd: si476x: Add chip properties handling code mfd: si476x: Add the bulk of the core driver mfd: si476x: Add commands abstraction layer mfd: rtsx: Support RTS5249 mfd: retu: Add Tahvo support mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus mfd: wm8994: Add some OF properties mfd: wm8994: Add device ID data to WM8994 OF device IDs input: Export matrix_keypad_parse_of_params() mfd: tps65090: Add compatible string for charger subnode mfd: db8500-prcmu: Support platform dependant device selection mfd: syscon: Fix warnings when printing resource_size_t of: Add stub of_get_parent for non-OF builds mfd: omap-usb-tll: Convert to devm_ioremap_resource() mfd: omap-usb-host: Convert to devm_ioremap_resource() ...
| | * input: matrix-keymap: Add function to read the new DT bindingSimon Glass2013-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have a binding which adds two parameters to the matrix keypad DT node. This is separate from the GPIO-driven matrix keypad binding, and unfortunately incompatible, since that uses row-gpios/col-gpios for the row and column counts. So the easiest option here is to provide a function for non-GPIO drivers to use to decode the binding. Note: We could in fact create an entirely separate structure to hold these two fields, but it does not seem worth it, yet. If we have more parameters then we can add this, and then refactor each driver to hold such a structure. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Tested-by: Sourav Poddar <sourav.poddar@ti.com> (v2) Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* | | Input: tps6507x-ts - remove vref from platform dataDmitry Torokhov2013-06-25
|/ / | | | | | | | | | | | | | | Although defined in platform data, vref is not used anywhere. Also remove model, irq, and clear_penirq as they are not used either. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | Input: MT - handle semi-mt devices in coreHenrik Rydberg2013-04-07
| | | | | | | | | | | | | | | | | | Most semi-mt drivers use the slots in a manual way, but really only need to treat the finger count manually. With this patch, a semi-mt driver may use the input-mt core for everything else. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | Merge tag 'v3.9-rc3' into nextDmitry Torokhov2013-03-17
|\| | | | | | | | | Merge with mainline to bring in module_platform_driver_probe() and devm_ioremap_resource().
| * Merge branch 'for-linus' of ↵Linus Torvalds2013-02-20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: "Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2 touchpad and a big update to ALPS driver from Kevin Cernekee that adds support for "Rushmore" touchpads and paves way for adding support for "Dolphin" touchpads. There is also a new input driver for Goldfish emulator and also Android keyreset driver was folded into SysRq code. A few more drivers were updated with device tree bindings and others got some small cleanups and fixes." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits) Input: cyttsp-spi - remove duplicate MODULE_ALIAS() Input: tsc2005 - add MODULE_ALIAS Input: tegra-kbc - require CONFIG_OF, remove platform data Input: synaptics - initialize pointer emulation usage Input: MT - do not apply filtering on emulated events Input: bma150 - make some defines public and fix some comments Input: bma150 - fix checking pm_runtime_get_sync() return value Input: ALPS - enable trackstick on Rushmore touchpads Input: ALPS - add support for "Rushmore" touchpads Input: ALPS - make the V3 packet field decoder "pluggable" Input: ALPS - move pixel and bitmap info into alps_data struct Input: ALPS - fix command mode check Input: ALPS - rework detection of Pinnacle AGx touchpads Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults() Input: ALPS - use function pointers for different protocol handlers Input: ALPS - rework detection sequence Input: ALPS - introduce helper function for repeated commands Input: ALPS - move alps_get_model() down below hw_init code Input: ALPS - copy "model" info into alps_data struct Input: ALPS - document the alps.h data structures ...
| * \ Merge branch 'for-linus' of ↵Linus Torvalds2012-12-18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull second round of input updates from Dmitry Torokhov: "As usual, there are a couple of new drivers, input core now supports managed input devices (devres), a slew of drivers now have device tree support and a bunch of fixes and cleanups." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (71 commits) Input: walkera0701 - fix crash on startup Input: matrix-keymap - provide a proper module license Input: gpio_keys_polled - switch to using gpio_request_one() Input: gpio_keys - switch to using gpio_request_one() Input: wacom - fix touch support for Bamboo Fun CTH-461 Input: xpad - add a few new VID/PID combinations Input: xpad - minor formatting fixes Input: gpio-keys-polled - honor 'autorepeat' setting in platform data Input: tca8418-keypad - switch to using managed resources Input: tca8418_keypad - increase severity of failures in probe() Input: tca8418_keypad - move device ID tables closer to where they are used Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data Input: tca8418_keypad - use a temporary variable for parent device Input: tca8418_keypad - add support for shared interrupt Input: tca8418_keypad - add support for device tree bindings Input: remove Compaq iPAQ H3600 (Bitsy) touchscreen driver Input: bu21013_ts - add support for Device Tree booting Input: bu21013_ts - move GPIO init and exit functions into the driver Input: bu21013_ts - request regulator that actually exists ARM: ux500: Strip out duplicate touch screen platform information ...
| * \ \ Merge tag 'mfd-3.8-1' of ↵Linus Torvalds2012-12-16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFS update from Samuel Ortiz: "This is the MFD patch set for the 3.8 merge window. We have several new drivers, most of the time coming with their sub devices drivers: - Austria Microsystem's AS3711 - Nano River's viperboard - TI's TPS80031, AM335x TS/ADC, - Realtek's MMC/memstick card reader - Nokia's retu We also got some notable cleanups and improvements: - tps6586x got converted to IRQ domains. - tps65910 and tps65090 moved to the regmap IRQ API. - STMPE is now Device Tree aware. - A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ APIs and a conversion to the recently added PWM framework. - sta2x11 gained regmap support. Then the rest is mostly tiny cleanups and fixes, among which we have Mark's wm5xxx and wm8xxx patchset." Far amount of annoying but largely trivial conflicts. Many due to __devinit/exit removal, others due to one or two of the new drivers also having come in through another tree. * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits) mfd: tps6507x: Convert to devm_kzalloc mfd: stmpe: Update DT support for stmpe driver mfd: wm5102: Add readback of DSP status 3 register mfd: arizona: Log if we fail to create the primary IRQ domain mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ mfd: tps80031: Add terminating entry for tps80031_id_table mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask() mfd: wm5102: Add tuning for revision B mfd: arizona: Defer patch initialistation until after first device boot mfd: tps65910: Fix wrong ack_base register mfd: tps65910: Remove unused data mfd: stmpe: Get rid of irq_invert_polarity mfd: ab8500-core: Fix invalid free of devm_ allocated data mfd: wm5102: Mark DSP memory regions as volatile mfd: wm5102: Correct default for LDO1_CONTROL_2 mfd: arizona: Register haptics devices mfd: wm8994: Make current device behaviour the default mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ mfd: Fix stmpe.c build when OF is not enabled mfd: jz4740-adc: Use devm_kzalloc ...
| | * | | input: TSC: ti_tscadc: Rename the existing touchscreen driverPatil, Rachna2012-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make way for addition of MFD driver. The existing touchsreen driver is a MFD client. For better readability we rename the file to indicate its functionality as only touchscreen. Signed-off-by: Patil, Rachna <rachna@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * | | input: TSC: ti_tscadc: Add Step configuration as platform dataPatil, Rachna2012-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 16 programmable Step Configuration registers which are used by the sequencer. Program the Steps in order to configure a channel input to be sampled. If the same step is applied several times, the coordinate values read are more accurate. Hence we provide the user an option of how many steps should be configured. For ex: If this value is assigned as 4, This means that 4 steps are applied to read x co-ordinate and 4 steps to read y co-ordinate. Furtheron the interrupt handler already holds code to use delta filter and report the best value out of these values to the input sub-system. Signed-off-by: Patil, Rachna <rachna@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| * | | | Input: mt: add input_mt_is_usedBenjamin Tissoires2012-11-15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch extracts the test (slot->frame == mt->frame) so that it can be used in third party drivers. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | | Merge branch 'for-linus' of ↵Linus Torvalds2012-10-02
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: "A few drivers were updated with device tree bindings and others got a few small cleanups and fixes." Fix trivial conflict in drivers/input/keyboard/omap-keypad.c due to changes clashing with a whitespace cleanup. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits) Input: wacom - mark Intuos5 pad as in-prox when touching buttons Input: synaptics - adjust threshold for treating position values as negative Input: hgpk - use %*ph to dump small buffer Input: gpio_keys_polled - fix dt pdata->nbuttons Input: Add KD[GS]KBDIACRUC ioctls to the compatible list Input: omap-keypad - fixed formatting Input: tegra - move platform data header Input: wacom - add support for EMR on Cintiq 24HD touch Input: s3c2410_ts - make s3c_ts_pmops const Input: samsung-keypad - use of_get_child_count() helper Input: samsung-keypad - use of_match_ptr() Input: uinput - fix formatting Input: uinput - specify exact bit sizes on userspace APIs Input: uinput - mark failed submission requests as free Input: uinput - fix race that can block nonblocking read Input: uinput - return -EINVAL when read buffer size is too small Input: uinput - take event lock when fetching events from buffer Input: get rid of MATCH_BIT() macro Input: rotary-encoder - add DT bindings Input: rotary-encoder - constify platform data pointers ...
* | | | | Input: auo-pixcir-ts - handle reset gpio directlyHeiko Stübner2013-02-24
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devicetree based platforms don't handle device callbacks very well and until now no board has come along that needs more extended hwinit than pulling the rst gpio high. Therefore pull the reset handling directly into the driver and remove the callbacks from the driver. If extended device setup is needed at some later point, power-sequences would probably be the solution of choice. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | | | Input: tegra-kbc - require CONFIG_OF, remove platform dataStephen Warren2013-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tegra only supports, and always enables, device tree. Remove all ifdefs and runtime checks for DT support from the driver. Platform data is therefore no longer required. Delete the header that defines it, and rework the driver to parse the device tree directly into struct tegra_kbc. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | | | Input: adxl34x - make platform_data include self containedWolfram Sang2012-12-24
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Since it suggests to use defines from input.h (ABS_X, ...), also include the file to make them available. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | | Input: bu21013_ts - move GPIO init and exit functions into the driverLee Jones2012-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These GPIO init and exit functions have no place in platform data, they should be part of the driver instead, Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | | Merge branch 'for-next' of git://github.com/rydberg/linux into nextDmitry Torokhov2012-10-01
|\| | | |/ |/| | | | | | | Merge Henrik's updates to multitouch code. Even though Jiri already pulled them in I need to do it too since my changes to evdev using dynamic major would clash with them.
| * Input: MT - Get slot by keyHenrik Rydberg2012-09-19
| | | | | | | | | | | | | | | | | | | | Some devices use an internal key for tracking which cannot be directly mapped to slots. This patch provides a key-to-slot mapping, which can be used by drivers of such devices. Reviewed-and-tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * Input: MT - Add in-kernel trackingHenrik Rydberg2012-09-19
| | | | | | | | | | | | | | | | | | | | | | | | With the INPUT_MT_TRACK flag set, the function input_mt_assign_slots() can be used to match a new set of contacts against the currently used slots. The algorithm used is based on Lagrange relaxation, and performs very well in practice; slower than mtdev for a few corner cases, but faster in most commonly occuring cases. Tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>