Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v2.6.38 2011-02-15T17:40:27+00:00 2011-02-15T17:40:27+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-02-15T17:40:27+00:00 urn:sha1:87450bd55d6f7caa472b5db49a97ca373baf2577 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: matrix_keypad - increase the limit of rows and columns Input: wacom - fix error path in wacom_probe() Input: ads7846 - check proper condition when freeing gpio Revert "Input: do not pass injected events back to the originating handler" Input: sysrq - rework re-inject logic Input: serio - clear pending rescans after sysfs driver rebind Input: rotary_encoder - use proper irqflags Input: wacom_w8001 - report resolution to userland 2011-02-11T09:01:23+00:00 Trilok Soni tsoni@codeaurora.org 2011-02-11T08:44:41+00:00 urn:sha1:cfaea56741360311d0dabcb6603fa78c2e3de155 Some keyboard controllers support more than 16 columns and rows. Increase the limit to 32. Signed-off-by: Trilok Soni <tsoni@codeaurora.org> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-26T06:31:44+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-01-26T06:31:44+00:00 urn:sha1:6fb1b304255efc5c4c93874ac8c066272e257e28 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - pass touch resolution to clients through input_absinfo Input: wacom - add 2 Bamboo Pen and touch models Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup Input: tegra-kbc - add tegra keyboard driver Input: gpio_keys - switch to using request_any_context_irq Input: serio - allow registered drivers to get status flag Input: ct82710c - return proper error code for ct82c710_open Input: bu21013_ts - added regulator support Input: bu21013_ts - remove duplicate resolution parameters Input: tnetv107x-ts - don't treat NULL clk as an error Input: tnetv107x-keypad - don't treat NULL clk as an error Fix up trivial conflicts in drivers/input/keyboard/Makefile due to additions of tc3589x/Tegra drivers 2011-01-18T04:49:12+00:00 Naveen Kumar Gaddipati naveen.gaddipati@stericsson.com 2011-01-18T04:40:58+00:00 urn:sha1:d2763b4f44e16f44cc4156c9591e74df9dcd88be Remove duplicate display resolution parameters from platform data as one pair is quite enough. Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-13T17:58:14+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-01-13T17:58:14+00:00 urn:sha1:d24450e2075b9ceeef8ad942e6391bc73eae6933 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: add SW_ROTATE_LOCK switch type Input: fix force feedback capability query example Input: wacom_w8001 - add single-touch support Input: add Austria Microsystem AS5011 joystick driver Input: remove aaed2000 keyboard driver Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 Input: cy8ctmg110_ts - Convert to dev_pm_ops Input: migor_ts - convert to dev_pm_ops Input: mcs5000_ts - convert to dev_pm_ops Input: eeti_ts - convert to dev_pm_ops Input: ad7879 - convert I2C to dev_pm_ops 2011-01-10T19:01:43+00:00 Fabien Marteau fabien.marteau@armadeus.com 2011-01-10T19:01:13+00:00 urn:sha1:9d084a3d5dffd076a9a006164ea0dbd9c495f2b0 This is driver for EasyPoint AS5011 2 axis joystick chip. This chip is plugged on an I2C bus. Tested on ARM processor (i.MX27). Signed-off-by: Fabien Marteau <fabien.marteau@armadeus.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-07T22:45:47+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-01-07T22:45:47+00:00 urn:sha1:31b6ca0af758a88e5e769b48cc6dde037ee37b96 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits) Input: wacom_w8001 - support pen or touch only devices Input: wacom_w8001 - use __set_bit to set keybits Input: bu21013_ts - fix misuse of logical operation in place of bitop Input: i8042 - add Acer Aspire 5100 to the Dritek list Input: wacom - add support for digitizer in Lenovo W700 Input: psmouse - disable the synaptics extension on OLPC machines Input: psmouse - fix up Synaptics comment Input: synaptics - ignore bogus mt packet Input: synaptics - add multi-finger and semi-mt support Input: synaptics - report clickpad property input: mt: Document interface updates Input: fix double equality sign in uevent Input: introduce device properties hid: egalax: Add support for Wetab (726b) Input: include MT library as source for kerneldoc MAINTAINERS: Update input-mt entry hid: egalax: Add support for Samsung NB30 netbook hid: egalax: Document the new devices in Kconfig hid: egalax: Add support for Wetab hid: egalax: Convert to MT slots ... Fixed up trivial conflict in drivers/input/keyboard/Kconfig 2010-12-22T19:11:47+00:00 Janusz Krzysztofik jkrzyszt@tis.icnet.pl 2010-12-20T21:09:22+00:00 urn:sha1:da1f026b532ce944d74461497dc6d8c16456466e Most keypad drivers make use of the <linux/input/matrix_keypad.h> defined macros, structures and inline functions. Convert omap-keypad driver to use those as well, as suggested by a compile time warning, hardcoded into the OMAP <palt/keypad.h>. Created against linux-2.6.37-rc5. Tested on Amstrad Delta. Compile tested with omap1_defconfig and omap2plus_defconfig shrinked to board-h4. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Tony Lindgren <tony@atomide.com> 2010-12-16T17:17:48+00:00 Dmitry Torokhov dmitry.torokhov@gmail.com 2010-12-16T17:17:48+00:00 urn:sha1:67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb Conflicts: drivers/input/Makefile 2010-12-16T09:41:38+00:00 Henrik Rydberg rydberg@euromail.se 2010-12-15T12:50:34+00:00 urn:sha1:c5f4dec1ceb6ab773bbbefbe64a7c990c7d6b17f 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>