summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
Commit message (Collapse)AuthorAgeFilesLines
* Input: cy8ctmg110 - add fuzz to ABS_X and ABS_Y to remove jitterJames Ketrenos2010-09-061-2/+2
| | | | | | | | | Without this the jitter on the touchscreen makes it hard to use for most GUI toolkits. Signed-off-by: James Ketrenos<jketreno@linux.intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Merge branch 'mrst-touchscreen' into nextDmitry Torokhov2010-09-053-0/+700
|\ | | | | | | | | Conflicts: drivers/input/touchscreen/Makefile
| * Input: mrst-touchscreen - move out of stagingDmitry Torokhov2010-09-013-0/+700
| | | | | | | | | | | | | | | | The driver is in reasonable shape now so let's move it out of staging. Acked-by: Alan Cox <alan@linux.intel.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: wm97xx-core - add retries to wm97xx_read_aux_adcEric Millbrandt2010-09-051-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Add logic to wm97xx_read_aux_adc() to retry reading the adc if the sample failed. This could occur if the previous sample was still in the return register or the sample timed-out. Also avoid a pathologic failure mode by disabling the digitizer and returning -EBUSY after 5 retries. Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: wm97xx-core - simplify error path in wm97xx_probe()Axel Lin2010-09-051-2/+1
| | | | | | | | | | | | | | | | | | | | Use platform_device_del() instead of platform_device_unregister() in error handling path. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Acked-by: Mark Brown <broonie@opensoruce.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: stmpe-ts - return -ENOMEM when memory allocation failsAxel Lin2010-09-051-3/+7
| | | | | | | | | | | | Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: stmpe-ts - remove input_free_device() in stmpe_ts_remove()Axel Lin2010-09-021-1/+0
| | | | | | | | | | | | | | It is forbidden to call input_free_device() after input_unregister_device(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: tsc2007 - fix a redundant assignment for pdataAxel Lin2010-09-021-1/+1
| | | | | | | | | | Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: tps6507x-ts - properly unregister input device on removalAxel Lin2010-09-021-1/+1
| | | | | | | | | | | | | | | | Once device is registered we should call input_unregister_device() instead of input_free_device(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: tps6507x-ts - add missing call to platform_set_drvdata()Axel Lin2010-09-021-0/+1
| | | | | | | | | | | | | | | | We call platform_get_drvdata() in tps6507x_ts_remove(), thus we should call platform_set_drvdata() in tps6507x_ts_probe(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: s3c2410_ts - fix s3c2410ts_probe error pathAxel Lin2010-09-021-1/+1
| | | | | | | | | | | | | | Use input_free_device() to free devices that have not been registered. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: add LPC32xx touchscreen controller driverKevin Wells2010-08-283-0/+422
| | | | | | | | | | | | | | | | | | | | | | This patch set introduces support for the LPC32xx touchscreen controller driver. The LPC32xx touchscreen controller supports automated event detection and X/Y data conversion for resistive touchscreens. Signed-off-by: Kevin Wells <wellsk40@gmail.com> Signed-off-by: Durgesh Pattamatta <durgesh.pattamatta@nxp.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: wacom_w8001 - add multitouch slot supportPeter Hutterer2010-08-281-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some serial wacom devices support two-finger touch. Test for this during init and parse the touch packets accordingly. Touch packets are processed using Protocol B (MT Slots). Note: there are several wacom versions that do touch but not two-finger touch. These are not catered for here, touch events for these are simply discarded. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: wacom_w8001 - support (and ignore) touch tabletsPeter Hutterer2010-08-281-2/+86
| | | | | | | | | | | | | | | | | | Tablets that support touch input may report different sized packages, depending on the touch sensor in the tablet. For now, discard the packages until we report them as touch input proper. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: wacom_w8001 - send BTN_TOOL_PEN/RUBBER and BTN_STYLUS eventsPeter Hutterer2010-08-281-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The protocol used by the w8001 supports status fields for tip, side switch and eraser as well as a RDY field for proximity. The protocol has a double usage for the f2 bit in the packet. If set, the data is either pen + side2 button or eraser. Assume eraser if the device comes into proximity with the f2 bit set, otherwise trigger the side2 button. If the device comes into proximity with the f2 bit and that bit disappears afterwards, fake proximity out for the eraser and proximity in for the pen. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | touchscreen: Fix sign bugKulikov Vasiliy2010-08-121-1/+1
| | | | | | | | | | | | | | | | | | platform_get_irq_byname() can return negative results, it is not seen to unsigned ts_irq. Make it signed. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Acked-By: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* | input: STMPE touch controller supportLuotao Fu2010-08-123-0/+408
| | | | | | | | | | | | | | | | | | This one adds a driver for STMPE touchscreen controllers. This driver depends on the stmpexxx mfd core driver. Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* | Merge branch 'next' into for-linusDmitry Torokhov2010-08-101-3/+3
|\ \
| * | Input: cy8ctmg100_ts - signedness bugDan Carpenter2010-08-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | "ret" should be signed here or the error handling doesn't work. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Merge branch 'next' into for-linusDmitry Torokhov2010-08-0212-578/+2685
|\ \ \ | |/ / | | / | |/ |/|
| * Input: cy8ctmg110 - capacitive touchscreen supportSamuli Konttila2010-07-313-1/+379
| | | | | | | | | | | | | | | | | | | | Add support for the cy8ctmg110 capacitive touchscreen used on some embedded devices. (Some clean up by Alan Cox) Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: usbtouchscreen - implement reset_resumeOliver Neukum2010-07-151-32/+76
| | | | | | | | | | | | | | | | | | | | | | This implements reset_resume() by splitting init into allocations of private data structures and device initializations. Device initializations are repeated upon reset_resume. Signed-off-by: Oliver Neukum <oneukum@suse.de> Tested-by: Petr Štetiar <ynezz@true.cz> Tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: usbtouchscreen - implement runtime power managementOliver Neukum2010-07-151-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | This implement USB autosuspend while the device is opened for devices that do remote wakeup with a fallback to open/close for those devices that don't. Devices that require the host to constantly poll them are never autosuspended. Signed-off-by: Oliver Neukum <oneukum@suse.de> Tested-by: Petr Štetiar <ynezz@true.cz> Tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: usbtouchscreen - implement basic suspend/resumeOliver Neukum2010-07-151-0/+25
| | | | | | | | | | | | | | | | | | This implements basic support for suspend & resume. Signed-off-by: Oliver Neukum <oneukum@suse.de> Tested-by: Petr Štetiar <ynezz@true.cz> Tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: Add ATMEL QT602240 touchscreen driverJoonyoung Shim2010-07-143-0/+1414
| | | | | | | | | | | | | | | | | | The chip's full name is AT42QT602240 or ATMXT224. This is a capacitive touchscreen supporting 10-contact multitouch and using I2C interface. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: mcs - Add MCS touchkey driverJoonyoung Shim2010-07-041-3/+3
| | | | | | | | | | | | | | This adds support for MELPAS MCS5000/MSC5080 touch key controllers. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ads7846 - extend the driver for ads7845 controller supportAnatolij Gustschin2010-07-031-37/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADS7845 is a controller for 5-wire touch screens and somewhat different from 7846. It requires three serial communications to accomplish one complete conversion. Unlike 7846 it doesn't allow Z1-/Z2- position measurement. The patch extends the ads7846 driver to also support ads7845. The packet struct is extended to contain needed command and conversion buffers. ads7846_rx() and ads7846_rx_val() now differentiate between 7845 and 7846 case. ads7846_probe() is modified to setup ads7845 specific command and conversion messages and to switch ads7845 into power-down mode, since this is needed to be prepared to respond to pendown interrupts. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ads7846 - do not allow altering platform dataDmitry Torokhov2010-07-031-16/+19
| | | | | | | | | | Tested-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ad7879 - report EV_KEY/BTN_TOUCH eventsMichael Hennerich2010-07-031-3/+13
| | | | | | | | | | | | | | | | | | | | | | Some input events users such as Android require BTN_TOUCH events. Implement EV_KEY/BTN_TOUCH and make sure that the release event is not erroneous scheduled without a preceding valid touch. Avoid duplicated BTN_TOUCH events, even though input core filters them. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ad7879 - fix spi word size to 16 bitMichael Hennerich2010-07-031-0/+8
| | | | | | | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ad7879 - use i2c_smbus_read_i2c_block_data() to lower overheadMichael Hennerich2010-07-031-1/+4
| | | | | | | | | | | | | | | | Avoid additional addressing overhead incurred by word_data transfers. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ad7879 - add open and close methodsDmitry Torokhov2010-07-034-39/+86
| | | | | | | | | | Tested-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ad7879 - split bus logic outMike Frysinger2010-07-036-415/+484
| | | | | | | | | | | | | | | | | | | | The ad7879 driver is using the old bus method of only supporting one at a time (I2C or SPI). So refactor it like the other input drivers that support multiple busses simultaneously. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ad7879 - use threaded IRQDmitry Torokhov2010-06-301-27/+9
| | | | | | | | | | Tested-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Merge commit 'v2.6.35-rc3' into nextDmitry Torokhov2010-06-304-9/+1
| |\
| * | Input: usbtouchscreen - add support for ET&T TC4UM touchscreen controllerPetr Štetiar2010-06-282-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the ET&T TC4UM 4-wire USB touchscreen controller and tries to reuse the bits for TC5UH controller in kernel already. Data interface is same. Tested-by: Roger Pueyo Centelles <rogerpueyo@rogerpueyo.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: ads7846 - allow specifying irq trigger type in platform dataAnatolij Gustschin2010-06-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some platforms, for example with GPIO interrupts on mpc5121, it is not possible to configure falling edge interrupts. Specifying irq trigger type in platform data structure allows using ads7846 driver on such platforms. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: tps6507x-ts - remove unneeded NULL testJiri Slaby2010-06-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Stanse found that tsc is dereferenced earlier than checked for being NULL in tps6507x_ts_remove. Remove the test because there is no way for tsc to be NULL there. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: usbtouchscreen - reduce number fo be16_to_cpu conversionsDmitry Torokhov2010-06-081-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | Let's perform be16_to_cpu() conversions once for each received packet, and then use cached values. Makes code a little bit easier to follow. Tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: w90p910_ts - fix call to setup_timer()Wan ZongShun2010-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | No need to take address, w90p910_ts is already a pointer. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Merge commit 'v2.6.35-rc3' into for-linusDmitry Torokhov2010-06-224-9/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'for-linus' of ↵Linus Torvalds2010-06-044-11/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - add Cintiq 21UX2 and Intuos4 WL Input: ads7846 - fix compiler warning in ads7846_probe() Input: tps6507x-ts - a couple work queue cleanups Input: s3c2410_ts - tone down logging Input: s3c2410_ts - fix build error due to ADC Kconfig rename
| * | i2c: Remove all i2c_set_clientdata(client, NULL) in driversWolfram Sang2010-06-034-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I2C drivers can use the clientdata-pointer to point to private data. As I2C devices are not really unregistered, but merely detached from their driver, it used to be the drivers obligation to clear this pointer during remove() or a failed probe(). As a couple of drivers forgot to do this, it was agreed that it was cleaner if the i2c-core does this clearance when appropriate, as there is no guarantee for the lifetime of the clientdata-pointer after remove() anyhow. This feature was added to the core with commit e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers. As there is no need anymore to clear the clientdata-pointer, remove all current occurrences in the drivers to simplify the code and prevent confusion. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Richard Purdie <rpurdie@linux.intel.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Jean Delvare <khali@linux-fr.org>
* | | Input: ad7877 - fix spi word size to 16 bitOskar Schirmer2010-06-081-0/+7
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With no word size given in the users platform data, a generic spi host controller driver will assume a default word size of eight bit. This causes transmission to be performed bytewise, which will fail on little endian machines for sure. Failure on big endian depends on usage of slave select to mark word boundaries. Anyway, ad7877 is specified to work with 16 bit per word, so unconditionally set the word size accordingly. Flag an error where 16 bit per word is not available. Signed-off-by: Oskar Schirmer <os@emlix.com> Signed-off-by: Daniel Glöckner <dg@emlix.com> Signed-off-by: Oliver Schneidewind <osw@emlix.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: ads7846 - fix compiler warning in ads7846_probe()Dmitry Torokhov2010-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the follwing warning introduced by commit 067fb2f648543894ce775082c5636f4c32b99e4f ("Input: ads7846 - return error on regulator_get() failure"): drivers/input/touchscreen/ads7846.c: In function 'ads7846_probe': drivers/input/touchscreen/ads7846.c:1167: warning: format '%ld' expects type 'long int', but argument 4 has type 'int' Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: tps6507x-ts - a couple work queue cleanupsDan Carpenter2010-06-021-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | 1) Use msecs_to_jiffies() instead of calculating by hand. 2) Call cancel_delayed_work_sync() instead of cancel_delayed_work() followed by a separate flush_workqueue(). 3) Remove the "tsc->wq = 0;" Sparse complains about that because tsc->wq is a pointer, not an int. It's not needed because we just free the pointer anyway. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: s3c2410_ts - tone down loggingMark Brown2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | The S3C touchscreen driver is logging at LOG_INFO on every stylus up event which spams the console needlessly. Reduce the priority of the message to debug level for some peace and quiet. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: s3c2410_ts - fix build error due to ADC Kconfig renameMark Brown2010-05-311-1/+1
|/ | | | | | | | | The name of the Kconfig symbol for the ADC has changed as a result of application to more SoCs but the select statement has not been updated, causing linker failures as the ADC core has not been built. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* input: Touchscreen driver for TPS6507xTodd Fischer2010-05-283-0/+414
| | | | | | | | | Add touch screen input driver for TPS6507x family of multi-function chips. Uses the TPS6507x MFD driver. No interrupt support due to testing limitations of current hardware. Signed-off-by: Todd Fischer <todd.fischer@ridgerun.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* Merge branch 'for-linus' of ↵Linus Torvalds2010-05-272-3/+8
|\ | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: usbtouchscreen - support bigger iNexio touchscreens Input: ads7846 - return error on regulator_get() failure Input: twl4030-vibra - correct the power down sequence Input: enable onkey driver of max8925 Input: use ABS_CNT rather than (ABS_MAX + 1)
OpenPOWER on IntegriCloud