aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
AgeCommit message (Collapse)AuthorFilesLines
2010-09-05Input: wacom - parse the Bamboo device familyPing Cheng2-9/+37
The Bamboo devices have multiple interfaces which need to be setup separately. Use the HID parsing mechanism to achieve that. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wacom - add fuzz parameters to featuresHenrik Rydberg3-4/+15
The signal-to-noise ratio varies between devices, but currently all devices are treated the same way. Add fuzz parameters to the feature struct, allowing for tailored treatment of devices. Signed-off-by: Henrik Rydberg <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Merge branch 'mrst-touchscreen' into nextDmitry Torokhov3-0/+700
Conflicts: drivers/input/touchscreen/Makefile
2010-09-05Input: add support for PowerOn button on the AB8500 MFDSundar R Iyer3-0/+168
Add the PowerOn (PonKey) button support to detect power on/off events. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Sundar R Iyer <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: fix a few typosDmitry Torokhov1-3/+3
Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wm97xx-core - add retries to wm97xx_read_aux_adcEric Millbrandt1-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 <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: wm97xx-core - simplify error path in wm97xx_probe()Axel Lin1-2/+1
Use platform_device_del() instead of platform_device_unregister() in error handling path. Signed-off-by: Axel Lin <[email protected]> Acked-by: Liam Girdwood <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-05Input: stmpe-ts - return -ENOMEM when memory allocation failsAxel Lin1-3/+7
Signed-off-by: Axel Lin <[email protected]> Acked-by: Wolfram Sang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-02Input: stmpe-ts - remove input_free_device() in stmpe_ts_remove()Axel Lin1-1/+0
It is forbidden to call input_free_device() after input_unregister_device(). Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-02Input: tsc2007 - fix a redundant assignment for pdataAxel Lin1-1/+1
Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-02Input: tps6507x-ts - properly unregister input device on removalAxel Lin1-1/+1
Once device is registered we should call input_unregister_device() instead of input_free_device(). Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-02Input: tps6507x-ts - add missing call to platform_set_drvdata()Axel Lin1-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 <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-02Input: s3c2410_ts - fix s3c2410ts_probe error pathAxel Lin1-1/+1
Use input_free_device() to free devices that have not been registered. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-01Input: add support for Hanwang tabletsXing Wei3-0/+377
Add support for Art Master III tablet of BeiJing HanwangTechnology Co, Ltd. Signed-off-by: Xing Wei <[email protected]> Acked-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-09-01Input: mrst-touchscreen - move out of stagingDmitry Torokhov3-0/+700
The driver is in reasonable shape now so let's move it out of staging. Acked-by: Alan Cox <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-31Input: i8042 - fix device removal on unloadDmitry Torokhov1-1/+1
We need to call platform_device_unregister(i8042_platform_device) before calling platform_driver_unregister() because i8042_remove() resets i8042_platform_device to NULL. This leaves the platform device instance behind and prevents driver reload. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=16613 Reported-by: Seryodkin Victor <[email protected]> Cc: [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-31Input: add support for OMAP4 keyboard controllerAbraham Arce3-0/+297
OMAP4 keyboard controller includes: - built-in scanning algorithm - debouncing feature Driver implementation is based on matrix_keypad.c Signed-off-by: Syed Rafiuddin <[email protected]> Signed-off-by: Abraham Arce <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-31Input: bcm5974 - adjust major/minor to scaleHenrik Rydberg1-4/+8
By visual inspection, the reported touch_major and touch_minor axes are a factor of two too small. Presumably the device actually reports the semi-major and semi-minor axes. Corrected with this patch. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: add LPC32xx touchscreen controller driverKevin Wells3-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 <[email protected]> Signed-off-by: Durgesh Pattamatta <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: wacom_w8001 - add multitouch slot supportPeter Hutterer1-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 <[email protected]> Acked-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: wacom_w8001 - support (and ignore) touch tabletsPeter Hutterer1-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 <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: wacom_w8001 - send BTN_TOOL_PEN/RUBBER and BTN_STYLUS eventsPeter Hutterer1-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 <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: MT - initialize slots to unusedHenrik Rydberg1-2/+9
For MT slots, the ABS_MT_TRACKING_ID determines whether a slot is in use, but currently leaves initialization up to the drivers. This patch sets the slot state to unused upon creation. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-28Input: wacom - fix mousewheel handling for old wacom tabletsMike Auty1-2/+2
This fixes a regression introduced in 3b57ca0f80c5c8994b5b1e3d3f904cfe727951f2. The data[6] byte contains either 1 or -1 depending on the whether the mouse wheel on older wacom tablets is moved down (1) or up (-1). The patch introduced in the above commit changed the cast from (signed char) to (signed). When cast as a signed integer and negated, the value of -1 (stored in the byte as 0xff) became -255 rather than 1. This patch reverts the cast to a (signed char) and also removes an unnecessary (signed) cast, as all the values operated on are bitmasked. Signed-off-by: Mike Auty <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Cc; [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-25Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()Axel Lin1-2/+0
No need to call input_free_device() after input_unregister_device(). Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-25Input: mousedev - fix regression of inverting axesChristoph Fritz1-4/+4
Introduced by 987a6c0298260b7aa40702b349282554d6180e4b a swap in max/min calculation gets fixed by this patch. Reported-by: Bruno Prémont <[email protected]> Signed-off-by: Christoph Fritz <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-21Input: uinput - add devname alias to allow module on-demand loadKay Sievers1-0/+2
Recent modprobe and udev versions allow to create device nodes for modules which are not loaded. Only the first access will cause the in-kernel module loader to pull-in the module. Systems which never access the device node will not needlessly load the module, and no longer need init scripts or other facilities to unconditionally load it. Signed-off-by: Kay Sievers <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-21Input: hil_kbd - fix compile errorDmitry Torokhov1-6/+6
Fix another compile breakage stemming from 987a6c02 ("Input: switch to input_abs_*() access functions") Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-19input: __rcu annotationsArnd Bergmann1-1/+1
Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> Cc: Dmitry Torokhov <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Reviewed-by: Josh Triplett <[email protected]>
2010-08-16Merge branch 'for-2.6.36' into for-2.6.37Mark Brown85-1207/+7024
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c
2010-08-13Input: fix faulty XXinput_* callsDaniel Mack2-3/+3
They've been introduced by 987a6c02 ("Input: switch to input_abs_*() access functions") and they appear to be some kind of debug left-over. [Dmitry Torokhov: these are my fault - I added XX prefixes in places where I wanted to do additional review of the code but failed to actually do that in these particular instances.] Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-12Merge branch 'params' of ↵Linus Torvalds2-15/+25
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits) param: don't deref arg in __same_type() checks param: update drivers/acpi/debug.c to new scheme param: use module_param in drivers/message/fusion/mptbase.c ide: use module_param_named rather than module_param_call param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes. param: lock myri10ge_fw_name against sysfs changes. param: simple locking for sysfs-writable charp parameters param: remove unnecessary writable charp param: add kerneldoc to moduleparam.h param: locking for kernel parameters param: make param sections const. param: use free hook for charp (fix leak of charp parameters) param: add a free hook to kernel_param_ops. param: silence .init.text references from param ops Add param ops struct for hvc_iucv driver. nfs: update for module_param_named API change AppArmor: update for module_param_named API change param: use ops in struct kernel_param, rather than get and set fns directly param: move the EXPORT_SYMBOL to after the definitions. ...
2010-08-12Merge branch 'for-next' of ↵Linus Torvalds6-0/+805
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (40 commits) mfd: Fix incorrect kfree(i2c) in wm8994-core i2c_driver probe mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe mfd: Fix incorrect kfree(i2c) in tps6507x i2c_driver probe mfd: Add TPS6586x driver mfd: Use macros instead of some constant magic numbers for menelaus mfd: Fix menelaus mmc slot 2 misconfiguration mfd: Missing slab.h includes mfd: Fix wrong wm8350-core kfree in error path mfd: Fix wm8994_device_init() return value mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit mfd: Fix tc6387xb resource reclaim mfd: Fix wrong goto labels for tc6393xb error handling mfd: Get rid of now unused mc13783 private header hwmon: Don't access struct mc13783 directly from mc13783-adc mfd: New mc13783 function exposing flags mfd: Check jz4740-adc kmalloc() result mfd: Fix jz4740-adc resource reclaim in probe error path mfd: Add WM8321 support mfd: Add stmpe auto sleep feature ...
2010-08-12Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds3-11/+11
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: mmc_spi: Fix unterminated of_match_table of/sparc: fix build regression from of_device changes of/device: Replace struct of_device with struct platform_device
2010-08-12ASoC: multi-component - ASoC Multi-Component SupportLiam Girdwood1-2/+2
This patch extends the ASoC API to allow sound cards to have more than one CODEC and more than one platform DMA controller. This is achieved by dividing some current ASoC structures that contain both driver data and device data into structures that only either contain device data or driver data. i.e. struct snd_soc_codec ---> struct snd_soc_codec (device data) +-> struct snd_soc_codec_driver (driver data) struct snd_soc_platform ---> struct snd_soc_platform (device data) +-> struct snd_soc_platform_driver (driver data) struct snd_soc_dai ---> struct snd_soc_dai (device data) +-> struct snd_soc_dai_driver (driver data) struct snd_soc_device ---> deleted This now allows ASoC to be more tightly aligned with the Linux driver model and also means that every ASoC codec, platform and (platform) DAI is a kernel device. ASoC component private data is now stored as device private data. The ASoC sound card struct snd_soc_card has also been updated to store lists of it's components rather than a pointer to a codec and platform. The PCM runtime struct soc_pcm_runtime now has pointers to all its components. This patch adds DAPM support for ASoC multi-component and removes struct snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec or runtime PCM level basis rather than using snd_soc_socdev. Other notable multi-component changes:- * Stream operations now de-reference less structures. * close_delayed work() now runs on a DAI basis rather than looping all DAIs in a card. * PM suspend()/resume() operations can now handle N CODECs and Platforms per sound card. * Added soc_bind_dai_link() to bind the component devices to the sound card. * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove DAI link components. * sysfs entries can now be registered per component per card. * snd_soc_new_pcms() functionailty rolled into dai_link_probe(). * snd_soc_register_codec() now does all the codec list and mutex init. This patch changes the probe() and remove() of the CODEC drivers as follows:- o Make CODEC driver a platform driver o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core. o Removed all static codec pointers (drivers now support > 1 codec dev) o snd_soc_register_pcms() now done by core. o snd_soc_register_dai() folded into snd_soc_register_codec(). CS4270 portions: Acked-by: Timur Tabi <[email protected]> Some TLV320aic23 and Cirrus platform fixes. Signed-off-by: Ryan Mallon <[email protected]> TI CODEC and OMAP fixes Signed-off-by: Peter Ujfalusi <[email protected]> Signed-off-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Jarkko Nikula <[email protected]> Samsung platform and misc fixes :- Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Joonyoung Shim <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Reviewed-by: Jassi Brar <[email protected]> Signed-off-by: Seungwhan Youn <[email protected]> MPC8610 and PPC fixes. Signed-off-by: Timur Tabi <[email protected]> i.MX fixes and some core fixes. Signed-off-by: Sascha Hauer <[email protected]> J4740 platform fixes:- Signed-off-by: Lars-Peter Clausen <[email protected]> CC: Tony Lindgren <[email protected]> CC: Nicolas Ferre <[email protected]> CC: Kevin Hilman <[email protected]> CC: Sascha Hauer <[email protected]> CC: Atsushi Nemoto <[email protected]> CC: Kuninori Morimoto <[email protected]> CC: Daniel Gloeckner <[email protected]> CC: Manuel Lauss <[email protected]> CC: Mike Frysinger <[email protected]> CC: Arnaud Patard <[email protected]> CC: Wan ZongShun <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-08-12touchscreen: Fix sign bugKulikov Vasiliy1-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 <[email protected]> Acked-By: Luotao Fu <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2010-08-12input: STMPE touch controller supportLuotao Fu3-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 <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2010-08-12input: Add STMPE keypad driverRabin Vincent3-0/+397
Add an input driver for the keypad on STMPE I/O expanders. This driver uses the common support provided by the STMPE MFD driver. Acked-by: Dmitry Torokhov <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Rabin Vincent <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2010-08-11panic: keep blinking in spite of long spin timer modeTAMUKI Shoichi1-20/+5
To keep panic_timeout accuracy when running under a hypervisor, the current implementation only spins on long time (1 second) calls to mdelay. That brings a good effect, but the problem is the keyboard LEDs don't blink at all on that situation. This patch changes to call to panic_blink_enter() between every mdelay and keeps blinking in spite of long spin timer mode. The time to call to mdelay is now 100ms. Even this change will keep panic_timeout accuracy enough when running under a hypervisor. Signed-off-by: TAMUKI Shoichi <[email protected]> Cc: Ben Dooks <[email protected]> Cc: Russell King <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Cc: Anton Blanchard <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-11param: use ops in struct kernel_param, rather than get and set fns directlyRusty Russell2-15/+25
This is more kernel-ish, saves some space, and also allows us to expand the ops without breaking all the callers who are happy for the new members to be NULL. The few places which defined their own param types are changed to the new scheme (more which crept in recently fixed in following patches). Since we're touching them anyway, we change get() and set() to take a const struct kernel_param (which they really are). This causes some harmless warnings until we fix them (in following patches). To reduce churn, module_param_call creates the ops struct so the callers don't have to change (and casts the functions to reduce warnings). The modern version which takes an ops struct is called module_param_cb. Signed-off-by: Rusty Russell <[email protected]> Reviewed-by: Takashi Iwai <[email protected]> Tested-by: Phil Carmody <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Ville Syrjala <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Alessandro Rubini <[email protected]> Cc: Michal Januszewski <[email protected]> Cc: Trond Myklebust <[email protected]> Cc: "J. Bruce Fields" <[email protected]> Cc: Neil Brown <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
2010-08-10Merge branch 'for-linus' of ↵Linus Torvalds22-200/+279
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: xpad - add USB-ID for PL-3601 Xbox 360 pad Input: cy8ctmg100_ts - signedness bug Input: elantech - report position also with 3 fingers Input: elantech - discard the first 2 positions on some firmwares Input: adxl34x - do not mark device as disabled on startup Input: gpio_keys - add hooks to enable/disable device Input: evdev - rearrange ioctl handling Input: dynamically allocate ABS information Input: switch to input_abs_*() access functions Input: add static inline accessors for ABS properties
2010-08-10Merge branch 'next' into for-linusDmitry Torokhov22-200/+279
2010-08-10Input: xpad - add USB-ID for PL-3601 Xbox 360 padChristoph Fritz1-0/+1
This patch adds USB Vendor and Product ID for Pelican PL-3601 'TSZ' Wired Xbox 360 Controller to the device table. Signed-off-by: Christoph Fritz <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-10Input: cy8ctmg100_ts - signedness bugDan Carpenter1-3/+3
"ret" should be signed here or the error handling doesn't work. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Alan Cox <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-09Revert "Input: appletouch - fix integer overflow issue"Benjamin Herrenschmidt1-3/+3
This reverts commit 04b4b88cca0ebe3813b4b6f014fb6a0db380b137. While the original problem only caused a slight disturbance on the edge of the touchpad, the commit above to "fix" it completely breaks operation on some other models such as mine. We'll sort this out separately, revert the patch for now. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-08-06Merge branch 'irq-core-for-linus' of ↵Linus Torvalds1-1/+2
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: xen: Do not suspend IPI IRQs. powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt irq: Add new IRQ flag IRQF_NO_SUSPEND
2010-08-06of/device: Replace struct of_device with struct platform_deviceGrant Likely3-11/+11
of_device is just an alias for platform_device, so remove it entirely. Also replace to_of_device() with to_platform_device() and update comment blocks. This patch was initially generated from the following semantic patch, and then edited by hand to pick up the bits that coccinelle didn't catch. @@ @@ -struct of_device +struct platform_device Signed-off-by: Grant Likely <[email protected]> Reviewed-by: David S. Miller <[email protected]>
2010-08-05Input: elantech - report position also with 3 fingersÉric Piel1-0/+10
The 6-byte protocol supports reporting the position when three fingers are pressed, exactly like when one finger is pressed. Report this. In addition, it is also distinguishes between 3 and 4 fingers pressed. Signed-off-by: Éric Piel <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-05Input: elantech - discard the first 2 positions on some firmwaresÉric Piel2-14/+14
According to the Dell/Ubuntu driver, what was previously observed as "jumpy cursor" corresponds to the hardware sending incorrect data for the first two reports of a one touch finger. So let's use the same workaround as in the other driver. Also, detect another firmware version with the same behaviour, as in the other driver. Signed-off-by: Éric Piel <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-05Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-14/+11
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits) of/platform: Register of_platform_drivers with an "of:" prefix of/address: Clean up function declarations of/spi: call of_register_spi_devices() from spi core code of: Provide default of_node_to_nid() implementation. of/device: Make of_device_make_bus_id() usable by other code. of/irq: Fix endian issues in parsing interrupt specifiers of: Fix phandle endian issues of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string of: remove of_default_bus_ids of: make of_find_device_by_node generic microblaze: remove references to of_device and to_of_device sparc: remove references to of_device and to_of_device powerpc: remove references to of_device and to_of_device of/device: Replace of_device with platform_device in includes and core code of/device: Protect against binding of_platform_drivers to non-OF devices of: remove asm/of_device.h of: remove asm/of_platform.h of/platform: remove all of_bus_type and of_platform_bus_type references of: Merge of_platform_bus_type with platform_bus_type drivercore/of: Add OF style matching to platform bus ... Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just some obj-y removals by the devicetree branch, while the microblaze updates added a new file.