summaryrefslogtreecommitdiff
path: root/drivers/input
AgeCommit message (Collapse)Author
2011-04-06arm: tegra: Remove executable bit from source filesRobert Morell
Generated with the script: find \( -name "*.c" -or -name "*.h" -or -name "*akefile" -or \ -name "*\.mk" \) -type f -perm /+x | xargs chmod -x Change-Id: Iabae1aa20fd49a1c8db439fc132182d0f629deab Reviewed-on: http://git-master/r/26806 Reviewed-by: Robert Morell <rmorell@nvidia.com> Tested-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Janne Hellsten <jhellsten@nvidia.com>
2011-02-04input: touch: fix suspend/resume of atmel maxtouchtegra-10.11.4tegra-10.11.3Nitin Kumbhar
Add support for atmel's maxtouch to enter/exit sleep mode BUG 788286 Change-Id: I4d043d4a19147dd11c426b13ac5ef6eea77fe820 Reviewed-on: http://git-master/r/18336 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Robert R Collins <rcollins@nvidia.com>
2011-02-02input: tegra-kbc: Correcting column indexSachin Nikam
Bug 785837 Change-Id: I008a37b17205d058d6ba12a7a34a5cdc747435d7 Reviewed-on: http://git-master/r/17893 Tested-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Victor Ryabukhin <vryabukhin@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-28input: gpio-keys: report wakeup key on resumeNitin Kumbhar
During resume, gpio-keys does not get updated state of gpios which fails to report wakeup key event. Update resume routine to report key event based on wakeup source. BUG 745149 Change-Id: Iff7a9b431f9da8d226c8d3cd522725c3049fef07 Reviewed-on: http://git-master/r/17455 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-28merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/tegra2_dvfs.c Change-Id: I3853d668107c191c94f731256a8d0b63149e8279
2011-01-27input: touch: maxtouch: change driver name to "atmel-maxtouch"Varun Wadekar
To match with its idc file. idc file is located in /device folder. idc file adds more information about touch panel. Change-Id: If99b7a9784a015d990447c843ba9b0defd3751a1 Reviewed-on: http://git-master/r/17200 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: Gaurav Sarode <gsarode@nvidia.com> Tested-by: Gaurav Sarode <gsarode@nvidia.com>
2011-01-27Revert "input: gpio-keys: wake up display on resume"Nitin Kumbhar
This reverts commit 0ddc54a60b12fb13fec7c5d8f9ff3f162c96818f. It leads to suspend-resume cycle as mentioned in the below bug. BUG 773133 Change-Id: I51e2a48a000752d4aba02bd3f8e7e8ab18316371 Reviewed-on: http://git-master/r/17178 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
2011-01-21Merge branch 'android-2.6.36' into android-tegra-2.6.36Colin Cross
2011-01-21input: keyreset: Only print message for default handlerColin Cross
Change-Id: I68e5451fef2e6f08bf1035077ea999e34a619f87 Signed-off-by: Colin Cross <ccross@android.com>
2011-01-20[ARM] tegra:kbc:Misc fixes and cleanupsPradeep Goudagunta
Following are changes: - Fixes stylistic, indenting and coding style issue. - Added option for scan timeout. - Fixes code to have only required number of key codes from board. - Remove the keycodes from driver and only based on board table. - Fixes the kbc platform data to provide better option for configuration. - Modified board files to build properly. Change-Id: I5e6b9f26ecf8db0769aabac9574cfb6d48c1f061 Reviewed-on: http://git-master/r/16254 Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-19Merge branch 'android-2.6.36' into android-tegra-2.6.36Colin Cross
2011-01-19input: evdev: Add missing wake_lock_destroyBenoit Goby
Change-Id: Ief1ef44d98a197e5b457f5e8617c413e76e3c6d2 Signed-off-by: Benoit Goby <benoit@android.com>
2011-01-10merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/fuse.c drivers/misc/Makefile Change-Id: I300b925d78b31efe00c342190d8dbd50e2e81230
2011-01-07Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
Conflicts: arch/arm/mm/cache-v6.S Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
2011-01-07Merge branch 'android-2.6.36' into android-tegra-2.6.36Colin Cross
2011-01-07Merge commit 'v2.6.36.3' into linux-tegra-2.6.36Colin Cross
2011-01-07input: keyreset: Allow reset function to be overridenColin Cross
Change-Id: Ibb3dda05772b2e89d7b2646689944d309cb1f74e Signed-off-by: Colin Cross <ccross@android.com>
2011-01-07Input: synaptics - fix handling of 2-button ClickPadsYan Li
commit 3bfa321e662edf90fb8123a02c987c2965fa50bb upstream. Lenovo S10-3t's ClickPad is a 2-button ClickPad that reports BTN_LEFT and BTN_RIGHT as normal touchpad, unlike the 1-button ClickPad used in HP mini 210 that reports solely BTN_MIDDLE. In 0xc0-cap response, the 1-button ClickPad has the 20-bit set while 2-button ClickPad has the 8-bit set. This patch makes the kernel only handle 1-button ClickPad specially, and treat 2-button ClickPad in the same fashion as regular touchpads. This fixes kernel bug #18122 and MeeGo bug #4807. Signed-off-by: Yan Li <yan.i.li@intel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-28[ARM] tegra: gpio based scrollwheel driverSachin Nikam
Reports Scroll keys: - Press - Scrollup - Scrolldown Change-Id: I47f6ca3d7b5bed4aa7441634850881df7066fce7 Reviewed-on: http://git-master/r/13618 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2010-12-23merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/board-ventana-power.c drivers/mfd/tps6586x.c Change-Id: Ic8c46d4251d6e71fa2900b7e876f87e256299bc4
2010-12-21Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
Conflicts: drivers/usb/gadget/composite.c Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1
2010-12-21Merge commit 'v2.6.36.2' into linux-tegra-2.6.36Colin Cross
2010-12-20input: gpio-keys: wake up display on resumeVarun Wadekar
check if any of the buttons is specifid as 'wakeup', and send its key code explicitly to the android layer while resuming so that display wakes up eventually. Bug 745149 Change-Id: Iad94efa0ed4a6a9ac054e7f72de3affa8762a037 Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/13774 Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2010-12-14Tegra-KBC: Driver implementationVictor Ryabukhin
See bug 734887 Previous implementation was working with ODM. All ODM parts was moved to kernel. Change-Id: I0db4a6713f473d35a4b7f1b9357f577b815ce49e Reviewed-on: http://git-master/r/9786 Tested-by: Victor Ryabukhin <vryabukhin@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2010-12-13[ARM/tegra] Touchscreen : Added Atmel Max-Touch driverRobert Collins
Change-Id: I87de64e2c1a87c8e4da89489b4c5c18860abb0f6 Reviewed-on: http://git-master/r/11491 Reviewed-by: Robert R Collins <rcollins@nvidia.com> Tested-by: Robert R Collins <rcollins@nvidia.com> Reviewed-by: Maria Gutowski <mgutowski@nvidia.com>
2010-12-09Input: i8042 - add Sony VAIO VPCZ122GX to nomux listDmitry Torokhov
[Note that the mainline will not have this particular fix but rather will blacklist entire VAIO line based off DMI board name. For stable I am being a bit more cautious and blacklist one particular product.] Trying to query/activate active multiplexing mode on this VAIO makes both keyboard and touchpad inoperable. Futher kernels will blacklist entire VAIO line, however here we blacklist just one particular model. Reported-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-21Merge commit 'v2.6.36' into android-2.6.36Dima Zavin
2010-10-21Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
2010-10-21Merge commit 'v2.6.36' into linux-tegra-2.6.36Colin Cross
2010-10-18Input: evdev - fix EVIOCSABS regressionDaniel Mack
448cd16 ("Input: evdev - rearrange ioctl handling") broke EVIOCSABS by checking for the wrong direction bit. Signed-off-by: Daniel Mack <zonque@gmail.com> Reported-by: Sven Neumann <s.neumann@raumfeld.com> Tested-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2010-10-18Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABSDaniel Mack
This fixes a regression introduced by the dynamic allocation of absinfo for input devices. We need to bail out early for input devices which don't have absolute axis. [ 929.664303] Pid: 2989, comm: input Not tainted 2.6.36-rc8+ #14 MS-7260/MS-7260 [ 929.664318] EIP: 0060:[<c12bdc01>] EFLAGS: 00010246 CPU: 0 [ 929.664331] EIP is at evdev_ioctl+0x4f8/0x59f [ 929.664341] EAX: 00000040 EBX: 00000000 ECX: 00000006 EDX: f45a1efc [ 929.664355] ESI: 00000000 EDI: f45a1efc EBP: f45a1f24 ESP: f45a1eb8 [ 929.664369] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 929.664402] f470da74 f6a30e78 f462c240 00000018 bfe4a260 00000000 f45b06fc 00000000 [ 929.664429] <0> 000000c4 b769d000 c3544620 f470da74 f45b06fc f45b06fc f45a1f38 c107dd1f [ 929.664458] <0> f4710b74 000000c4 00000000 00000000 00000000 0000029d 00000a74 f4710b74 [ 929.664500] [<c107dd1f>] ? handle_mm_fault+0x2be/0x59a [ 929.664513] [<c12bd709>] ? evdev_ioctl+0x0/0x59f [ 929.664524] [<c1099d30>] ? do_vfs_ioctl+0x494/0x4d9 [ 929.664538] [<c10432a1>] ? up_read+0x16/0x29 [ 929.664550] [<c101c818>] ? do_page_fault+0x2ff/0x32d [ 929.664564] [<c108d048>] ? do_sys_open+0xc5/0xcf [ 929.664575] [<c1099db6>] ? sys_ioctl+0x41/0x61 [ 929.664587] [<c1002710>] ? sysenter_do_call+0x12/0x36 [ 929.684570] ---[ end trace 11b83e923bd8f2bb ]--- Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2010-10-15Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
2010-10-15Merge commit 'v2.6.36-rc8' into linux-tegra-2.6.36Colin Cross
2010-10-12panjit_touch: add early suspend support to panjit I2C touchscreenGary King
Change-Id: I1adc2bb646269f17480718a7efb3dc14e6325fbc Signed-off-by: Gary King <gking@nvidia.com>
2010-10-10Input: wacom - fix pressure in Cintiq 21UX2Aristeu Rozanski
Currently the pressure range in Cintiq 21UX2 is limited to half of the supported. This patch fixes the problem. Signed-off-by: Aristeu Rozanski <aris@redhat.com> Acked-by: Ping Cheng <pingc@wacom.com> CC: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2010-10-06Merge branch 'android-2.6.36' into android-tegra-2.6.36Colin Cross
Conflicts: drivers/input/touchscreen/Kconfig Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02
2010-10-06touchscreen: panjit: use multi-touch reporting interfaceGary King
Change-Id: I2bcad8cd07725e36598545168f33b87b9f217c11 Signed-off-by: Gary King <gking@nvidia.com>
2010-10-06input: touchscreen: panjit_i2c: fix suspendGary King
the panjit touchscreen needs to be reset when returning from deep sleep mode; add a platform data structure to specify the reset GPIO. perform the reset during _probe, since the code already needs to exist for _resume delete a bunch of unused preprocessor defines Change-Id: I71ae65dec45710b0eab4625036edf75064d4cc2b Signed-off-by: Gary King <gking@nvidia.com>
2010-10-06panjit_touch: fix warning "control reaches end of non-void function"Gary King
Change-Id: I3a43dc58edff3687e294c2d2a09d1f6e06e27fce Signed-off-by: Gary King <gking@nvidia.com>
2010-10-06input: touchscreen driver for panjit capacitive i2c touch panelsGary King
driver supports the MGG1010AI06 and EGG1010AI06 capacitive touch panels Change-Id: I038030bf4c9acbd0d3d504427a32f4e46632c115 Signed-off-by: Gary King <gking@nvidia.com>
2010-10-04Input: wacom - fix runtime PM related deadlockDmitry Torokhov
When runtime PM is enabled by default for input devices, X hangs in wacom open: [<ffffffff814a00ea>] mutex_lock+0x1a/0x40 [<ffffffffa02bc94b>] wacom_resume+0x3b/0x90 [wacom] [<ffffffff81327a32>] usb_resume_interface+0xd2/0x190 [<ffffffff81327b5d>] usb_resume_both+0x6d/0x110 [<ffffffff81327c24>] usb_runtime_resume+0x24/0x40 [<ffffffff8130a2cf>] __pm_runtime_resume+0x26f/0x450 [<ffffffff8130a23a>] __pm_runtime_resume+0x1da/0x450 [<ffffffff8130a53a>] pm_runtime_resume+0x2a/0x50 [<ffffffff81328176>] usb_autopm_get_interface+0x26/0x60 [<ffffffffa02bc626>] wacom_open+0x36/0x90 [wacom] wacom_open() takes wacom->lock and calls usb_autopm_get_interface(), which in turn calls wacom_resume() which tries to acquire the lock again. The fix is to call usb_autopm_get_interface() first, before we take the lock. Since we do not do usb_autopm_put_interface() until wacom_close() is called runtime PM is effectively disabled for the driver, however changing it now would risk regressions so the complete fix will have to wait till the next merge window. Reported-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2010-09-29input: gpio_event: make driver be more robust against incorrectly configured ↵Dima Zavin
lvl trigger irqs Change-Id: Ie378600668500dcffeaaddeaba3628e5c2141aa4 Signed-off-by: Dima Zavin <dima@android.com>
2010-09-29Input: gpio_event: Don't call gpio_cansleep before gpio_request.Arve Hjønnevåg
If the gpio did not exist it would crash in gpiolib. Signed-off-by: Arve Hjønnevåg <arve@android.com>
2010-09-29drivers: input: misc: Fix section mismatch warningDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-29Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them ↵Rebecca Schultz Zavin
to driver Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> Signed-off-by: Arve Hjønnevåg <arve@android.com>
2010-09-29Input: synaptics_i2c_rmi: Send new multi touch eventsArve Hjønnevåg
Send both fingers using the new multitouch protocol in addition to the old single finger event and second finger ABS_HAT* hack. The new protocol does not specify how to report up events. To make sure the user-space frameworks can generate up events, we send at least one event where ABS_MT_TOUCH_MAJOR is zero before we stop sending events for a finger. Signed-off-by: Arve Hjønnevåg <arve@android.com>
2010-09-29Input: synaptics_i2c_rmi: Add sensitivity adjust option.Arve Hjønnevåg
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2010-09-29Input: synaptics_i2c_rmi: Add support for panels with has-no-relative-data ↵Arve Hjønnevåg
property. Signed-off-by: Arve Hjønnevåg <arve@android.com>
2010-09-29Input: synaptics_i2c_rmi: Driver for Synaptics Touchscreens using RMI over I2C.Arve Hjønnevåg
Signed-off-by: Arve Hjønnevåg <arve@android.com> Input: synaptics_i2c_rmi: disable_irq -> disable_irq_nosync Also remove duplicate swap macro Change-Id: I77266431ba5c267a5d92c4bdc2f127a5297065a8 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2010-09-29input: keychord: Add keychord driverMike Lockwood
This driver allows userspace to receive notification when client specified key combinations are pressed. The client opens /dev/keychord and writes a list of keychords for the driver to monitor. The client then reads or polls /dev/keychord for notifications. A client specified ID for the keychord is returned from read() when a keychord press is detected. Signed-off-by: Mike Lockwood <lockwood@android.com> keychord: fix to build without CONFIG_PREEMPT Change-Id: I911f13aeda4224b6fa57863bc7e8972fec8837fb