summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Input: wacom_w8001 - support pen or touch only devicesPing Cheng2010-12-301-12/+32
| | | | | | | | | Not all penabled devices support touch. The same holds true for touch devices, so we should be setting up devices according to the results returned when we query the hardware. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wacom_w8001 - use __set_bit to set keybitsPing Cheng2010-12-271-5/+5
| | | | | | | This makes code safer and easier to read. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Merge branch 'next' of ↵Dmitry Torokhov2010-12-2711-24/+168
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
| * Input: synaptics - ignore bogus mt packetHenrik Rydberg2010-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | In multitouch mode, at least one device (fw: 7.4 id: 0x1c0b1) sometimes sends a final main packet with x == 1. Since the normal values are above 1472, this is clearly bogus. At the same time, a two-finger touch is signaled, even though only one finger was on the pad to begin with. This patch ignores the packet altogether, removing the problem. Acked-by: Chris Bagwell <chris@cnpbagwell.com> Acked-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * Input: synaptics - add multi-finger and semi-mt supportHenrik Rydberg2010-12-212-3/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Synaptics 2.7 series of touchpads support a mode for reporting two sets of X/Y/Pressure data (advanced gesture mode). By default, these devices report only single finger data, depriving userspace of the nowadays ubiquitous two-finger scroll gesture. Enabling advanced gesture mode also enables the multi-finger report, although the device does not claim that capability. Up to three fingers can be reported this way. While two or three fingers are touching, the normal packet is prepended by a reduced finger packet of lower resolution. From the two packets (which do not represent the actual fingers), the bounding rectangle of the individual contacts can be extracted. This information is sufficient to perform scaling gestures and a limited form of rotation gesture. The behavior has been coined semi-mt capability, and is signaled to userspace via the INPUT_PROP_SEMI_MT device property. Work to decode the advanced gesture packet: Takashi Iwai. Cleanup and testing of the original patch: Chase Douglas. Minor cleanup and testing: Chris Bagwell. Finalization and semi-mt support: Henrik Rydberg. Reported-by: Tobyn Bertram Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chris Bagwell <chris@cnpbagwell.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * Input: synaptics - report clickpad propertyHenrik Rydberg2010-12-211-0/+3
| | | | | | | | | | | | | | | | | | | | With the new input property interface, it is possible to report the special quirks of a device using ioctl/sysfs. This patch sets up the device as a pointer, and reports the clickpad functionality via the INPUT_PROP_BUTTONPAD property. Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * input: mt: Document interface updatesHenrik Rydberg2010-12-201-18/+26
| | | | | | | | | | | | This patch documents the recent input-mt interface changes. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * Input: fix double equality sign in ueventHenrik Rydberg2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | Looking at the uevent stream for input devices, all properties are on the form "A=B" except the bitmap values, which are on the form "A==B". This bug has been around at least since 2007, and the input uevent code has been untouched since. The recent addition of device properties suggests this is a good time for a remedy. Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * Input: introduce device propertiesHenrik Rydberg2010-12-205-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today, userspace sets up an input device based on the data it emits. This is not always enough; a tablet and a touchscreen may emit exactly the same data, for instance, but the former should be set up with a pointer whereas the latter does not need to. Recently, a new type of touchpad has emerged where the buttons are under the pad, which changes logic without changing the emitted data. This patch introduces a new ioctl, EVIOCGPROP, which enables user access to a set of device properties useful during setup. The properties are given as a bitmap in the same fashion as the event types, and are also made available via sysfs, uevent and /proc/bus/input/devices. Acked-by: Ping Cheng <pingc@wacom.com> Acked-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Add support for Wetab (726b)Andy Ross2010-12-183-0/+4
| | | | | | | | | | | | | | | | | | | | This patch adds support for another Wetab device (726b), and grabs it accordingly in hid-core. [rydberg@euromail.se: rename and log message changes] Signed-off-by: Andy Ross <andy@plausible.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
* | Input: bu21013_ts - fix misuse of logical operation in place of bitopDavid Sterba2010-12-271-1/+1
| | | | | | | | | | | | Signed-off-by: David Sterba <dsterba@suse.cz> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: i8042 - add Acer Aspire 5100 to the Dritek listPali Rohár2010-12-271-0/+7
| | | | | | | | | | | | | | | | | | This patch adds notebook Acer Aspire 5100 to the list of Dritek HW. Acer Aspire 5100 needs Dritek keyboard extension to support all Fn keys. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Tested-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: psmouse - disable the synaptics extension on OLPC machinesAndres Salomon2010-12-231-0/+30
| | | | | | | | | | | | | | | | | | | | OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode). Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: psmouse - fix up Synaptics commentAndres Salomon2010-12-231-2/+2
| | | | | | | | | | | | | | | | Minor comment fixup for typos and grammar. Noticed while adding a separate workaround. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Merge branch 'next' of ↵Dmitry Torokhov2010-12-1617-216/+329
|\ \ | |/ | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next Conflicts: drivers/input/Makefile
| * Input: include MT library as source for kerneldocDmitry Torokhov2010-12-161-0/+4
| | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * MAINTAINERS: Update input-mt entryHenrik Rydberg2010-12-161-0/+2
| | | | | | | | | | | | | | | | The input multitouch core is now located in its own file, and maintained via a git tree. Update the maintainers entry accordingly. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Add support for Samsung NB30 netbookRichard Nauber2010-12-163-0/+4
| | | | | | | | | | | | | | | | | | | | | | The Samsung NB30 touch has a DWAV dual-touch device. This patch adds the NB30 to the list of supported devices, and grabs it accordingly in hid-core. [rydberg@euromail.se: rename and log message changes] Signed-off-by: Richard Nauber <Richard.Nauber@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Document the new devices in KconfigHenrik Rydberg2010-12-161-1/+2
| | | | | | | | | | | | | | | | Add the new supported devices to the kernel menu config help text. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Add support for WetabHenrik Rydberg2010-12-163-0/+4
| | | | | | | | | | | | | | | | | | | | The Wetab tablet dual-touch controller works the same way as the one in the Joojoo tablet. This patch adds the Wetab to the list of supported devices, and grabs it accordingly in hid-core. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Convert to MT slotsHenrik Rydberg2010-12-161-63/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | The firmware in the joojoo reports touches sequentially, one per report, which confuses the current driver. A further complication is the absense of any indication of a touch frame. This patch converts the driver to the MT slots protocol, and outputs one full touch frame per report. This way, proper handling for both firmwares is ensured. Tested-by: Philipp Merkel <mail@philmerk.de> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Add event filteringHenrik Rydberg2010-12-161-6/+10
| | | | | | | | | | | | | | | | | | Use estimated signal-to-noise ratios to reduce noise and limit the amount of events emitted. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Report zero as minimum pressureHenrik Rydberg2010-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The firmware reports a logical minimum of one, but in order for userspace applications to correctly map all reported values to non-zero pressure, the driver needs to report a logical minimum of zero. Fixed with this patch. Tested-by: Philipp Merkel <mail@philmerk.de> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Correct for device resolution report errorHenrik Rydberg2010-12-161-0/+2
| | | | | | | | | | | | | | | | | | The firmware of both supported devices report a X/Y maximum of 4095, whereas in reality, it is eight times larger. Fixed with this patch. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * hid: egalax: Setup input device manuallyHenrik Rydberg2010-12-161-12/+22
| | | | | | | | | | | | | | | | | | | | The hid core does not yet handle input filtering. Take over the setup of the input device, so that proper signal-to-noise ratios can be used. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Cc: Stephane Chatty <chatty@enac.fr> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * input: mt: Add hovering distance axisHenrik Rydberg2010-12-162-2/+10
| | | | | | | | | | | | | | | | | | | | Touch devices capable of hovering, i.e., fingers detected a distance from the surface, are not supported by the current input MT protocol. This patch adds ABS_MT_DISTANCE, which may be used to indicate the distance between the contact and the surface. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * input: mt: Move tracking and pointer emulation to input-mtHenrik Rydberg2010-12-167-71/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The drivers using the type B protocol all report tracking information the same way. The contact id is semantically equivalent to ABS_MT_SLOT, and the handling of ABS_MT_TRACKING_ID only complicates the driver. The situation can be improved upon by providing a common pointer emulation code, thereby removing the need for the tracking id in the driver. This patch moves all tracking event handling over to the input core, simplifying both the existing drivers and the ones currently in preparation. Acked-by: Ping Cheng <pingc@wacom.com> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * input: mt: Collect slots initialization codeHenrik Rydberg2010-12-166-15/+18
| | | | | | | | | | | | | | | | | | The MT slots devices all follow the same initialization pattern of creating slots and hinting about buffer size. Let drivers call an initialization function instead, and make sure it can be called repeatedly without side effects. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| * input: mt: Break out slots handlingHenrik Rydberg2010-12-169-65/+108
| | | | | | | | | | | | | | In preparation for common code to handle a larger set of MT slots devices, move the slots handling over to a separate file. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
* | Input: add ST1232 touchscreen controller driverTony SIM2010-12-153-5/+292
| | | | | | | | | | | | | | | | | | | | | | This patch introduces support for Sitronix ST1232 integrated capacitive touchscreen with LCD module. The touchscreen is multitouch capable and can report coordinates of up to two contact points. Signed-off-by: Tony SIM <chinyeow.sim.xt@renesas.com> Reviewed-by: Trilok Soni <tsoni@codeaurora.org> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLEDmitry Torokhov2010-12-071-0/+2
| | | | | | | | | | | | | | This should allow loading this module automatically on systems that have such device. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: tca6416-keypad - add support for tca6408aTony SIM2010-12-072-7/+16
| | | | | | | | | | | | | | Support 8-bit tca6408a I/O expander as a keypad. Signed-off-by: Tony SIM <chinyeow.sim.xt@renesas.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: use pr_fmt and pr_<level>Joe Perches2010-11-3010-68/+72
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ useJoe Perches2010-11-303-73/+63
| | | | | | | | | | | | | | | | | | | | | | Standardized message logging prefixes. Removed \n from dbg macro, added \n to each dbg call site. Removed direct use of __FILE__ from dbg, converted to pr_fmt(fmt) Added non-debug printf argument verification of dbg calls Removed "i8042.c" from printks, converted to pr_<level> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: add CMA3000 accelerometer driverHemanth V2010-11-307-0/+781
| | | | | | | | | | | | | | | | | | | | | | | | | | Add support for CMA3000 Tri-axis accelerometer, which supports Motion detect, Measurement and Free fall modes. CMA3000 supports both I2C/SPI bus for communication, currently the driver supports I2C based communication. Signed-off-by: Hemanth V <hemanthv@ti.com> Reviewed-by: Jonathan Cameron <jic23@cam.ac.uk> Reviewed-by: Sergio Aguirre <saaguirre@ti.com> Reviewed-by: Shubhrajyoti <Shubhrajyoti@ti.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: iforce - clean up MakefileDmitry Torokhov2010-11-221-12/+3
| | | | | | | | | | | | | | | | | | | | Use <module>-y notation to specify list of objects comprising iforce module and conditionally pull in USB and RS232 support. Also remove custom compiler flags and rely on general makefile rules for enabling warnings. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: clean up Makefile (use input-core-y)Dmitry Torokhov2010-11-221-1/+1
| | | | | | | | | | | | | | | | The proper way to specify multi-source object is to use <name>-y instead of <name>-obj (which is deprecated) as it allows conditional inclusion of modules in the list. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: ct82c710 - remove a redundant serio_register_port()Axel Lin2010-11-211-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | We already call serio_register_port() in ct82c710_probe(), thus remove a redundant serio_register_port() in ct82c710_init(). Looks like this bug is introduced by 916d83cfe5da1cda454d8b0ae233f06b58bd7f91 "Input: ct82c710 - convert to the new platform device interface" [dtor@mail.ru: also move printk to where we register port] Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exitAxel Lin2010-11-211-1/+0
| | | | | | | | | | | | | | | | | | serio_unregister_port() will call put_device() to free the memory. Thus remove kfree(ams_delta_serio) after serio_unregister_port(ams_delta_serio). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: ps2mult - fix wrong kfree in ps2mult_connect error pathAxel Lin2010-11-211-1/+1
| | | | | | | | | | Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: serio HIL MLC - don't deref null, don't leak and return proper errorJesper Juhl2010-11-202-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While reviewing various users of kernel memory allocation functions I came across drivers/input/serio/hil_mlc.c::hil_mlc_register() and noticed that: - it calls kzalloc() but fails to check for a NULL return before use. - it makes several allocations and if one fails it doesn't free the previous ones. - It doesn't return -ENOMEM in the failed memory allocation case (it just crashes). This patch corrects all of the above and also reworks the only caller of this function that I could find (drivers/input/serio/hp_sdc_mlc.c::hp_sdc_mlc_out()) so that it now checks the return value of hil_mlc_register() and properly propagates it on failure and I also restructured the code to remove some labels and goto's to make it, IMHO nicer to read. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Tested-by: Helge Deller <deller@gmx.de> Acked-by: Helge Deller <deller@gmx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: add support for keyboards on ST SPEAr platformRajeev Kumar2010-11-194-0/+495
| | | | | | | | | | Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: gameport - convert to use common workqueue instead of a threadDmitry Torokhov2010-11-181-84/+68
| | | | | | | | | | | | | | | | | | | | Instead of creating an exclusive thread to handle gameport events (which happen rarely), let's switch to common workqueue. With the arrival of concurrency-managed workqueue infrastructure we are not concerned that our callers or callees also using workqueue (no deadlocks anymore) and it should reduce total number of threads in the system. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: serio - convert to common workqueue instead of a threadDmitry Torokhov2010-11-181-86/+69
| | | | | | | | | | | | | | | | | | | | Instead of creating an exclusive thread to handle serio events (which happen rarely), let's switch to using common workqueue. With the arrival of concurrency-managed workqueue infrastructure we are not concerned that our callers or callees also using workqueue (no deadlocks anymore) and it should reduce total number of threads in the system. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: qt602240_ts - fix wrong sizeof in object table allocationChris Leech2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | The kcalloc call for the object table is using sizeof(struct qt602240_data) when it should be using sizeof(struct qt6602240_object), resulting in a larger allocation than is required. Signed-off-by: Chris Leech <christopher.leech@linux.intel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: qt602240_ts - convert to using dev_pm_opsDmitry Torokhov2010-11-181-7/+12
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: xpad - ensure xpad->bulk_out is initialized before submitting urbAxel Lin2010-11-181-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out by Oliver Neukum: xpad->irq_in is currently submitted before xpad->bulk_out is allocated. That however is a race, because the callback for irq_in can call xpad360w_process_packet(), which will in turn submit the bulk URB. This patch moves initialization for xpad->bulk_out earlier, so we can ensure xpad->bulk_out is initialized before submitting urb. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: hgpk - fix powersave modePaul Fox2010-11-151-9/+17
| | | | | | | | | | | | | | | | Recent testing of this codepath showed that it wasn't working, perhaps due to changes within the input layer. This fixes it. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: hgpk - recalibration tweaksDaniel Drake2010-11-151-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the recalibration guard where new recalibrations are triggered if we detect a packet too soon after calibrating - we found that this results in erroneous recalibrations, and if the recalibration failed then the rest of our badness-detection code will request another. Add a module option disabling all of the recalibration code, in case an OLPC deployment thinks all of the workarounds we have are doing more damage than good and wants to experiment with them all disabled. Based on work by Paul Fox. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: hgpk - detect simple mode overflowsDaniel Drake2010-11-151-0/+5
| | | | | | | | | | | | | | Based on work by Paul Fox. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
OpenPOWER on IntegriCloud