aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-06Merge branch 'next' into for-linusDmitry Torokhov9844-252603/+502307
Prepare first round of input updates for 3.17.
2014-08-06Merge branch 'wacom' into nextDmitry Torokhov11-2119/+1361
Merge large update to Wacom driver, converting it from USB to a HID driver and unifying wired and bluetooth support, from Benjamin Tissoires.
2014-08-06Input: wacom - only register once the MODULE_* macrosBenjamin Tissoires2-4/+5
Putting the various MODULE_* makes them appear several times in modinfo because wacom.h is used both in wacom_sys.c and wacom_wac.h. Having the macros near the module declaration makes them appear only once. Add also MODULE_VERSION(DRIVER_VERSION) to export the current version number. Signed-off-by: Benjamin Tissoires <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: HID - remove hid-wacom Bluetooth driverBenjamin Tissoires3-982/+2
Bluetooth Wacom tablets are now handled by the regular wacom.ko driver. Remove the now useless hid-wacom driver. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: wacom - add copyright note and bump version to 2.0Benjamin Tissoires1-1/+4
Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Benjamin Tissoires <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: wacom - remove passing id for wacom_set_reportPrzemo Firszt1-18/+17
Every call of wacom_set_report was passing "id" as a separate parameter and buffer also passed the same information. We can use first u8 of the buffer instead of "id" Signed-off-by: Przemo Firszt <[email protected]> Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: wacom - check for bluetooth protocol while setting OLEDsBenjamin Tissoires1-8/+21
Bluetooth Intuos 4 use 1-bit definition while the USB ones use a 4-bits definition. This changes the size of the raw image we receive, and thus the kernel will only accept 1-bit images for Bluetooth and 4-bits for USB. Signed-off-by: Benjamin Tissoires <[email protected]> Signed-off-by: Przemo Firszt <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: wacom - handle Intuos 4 BT in wacom.koBenjamin Tissoires5-2/+92
A good point of this change is that now, the Intuos4 bluetooth can handle the different tools (artpen, airbrush, mice), and we get a common interface between USB and BT for accessing the LEDs/OLEDs. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: wacom - handle Graphire BT tablets in wacom.koBenjamin Tissoires5-5/+132
First, merge the Graphire BT tablet. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: wacom - prepare the driver to include BT devicesBenjamin Tissoires2-3/+69
Now that wacom is a hid driver, there is no point in having a separate driver for bluetooth devices. This patch prepares the common paths of Bluetooth devices in the common wacom driver. It also adds the sysfs file "speed" used by Bluetooth devices. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Tested-by: Przemo Firszt <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-08-06Input: hyperv-keyboard - register as a wakeup sourceDexuan Cui1-0/+13
With this patch, we can press a key to wake up the VM after the VM executes "echo freeze > /sys/power/state". Signed-off-by: Dexuan Cui <[email protected]> Signed-off-by: K. Y. Srinivasan <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-31Input: imx_keypad - remove ifdef round PM methodsFabio Estevam1-4/+2
We can annotate the suspend/resume functions with '__maybe_unused' and get rid of the ifdef, which makes the code smaller and simpler. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-31Input: jornada720_ts - get rid of space indentation and use tabPramod Gurav1-13/+12
Signed-off-by: Pramod Gurav <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-31Input: jornada720_ts - switch to using managed resourcesPramod Gurav1-32/+13
This switches the driver to using managed resources to simplify error handling and to do away with remove function. Signed-off-by: Pramod Gurav <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-30Input: alps - Rushmore and v7 resolution supportHans de Goede2-0/+50
Add support for querying the physical size from the touchpad for Rushmore and v7 touchpads, and use that to tell userspace the device resolution. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-30Input: mcs5000_ts - remove ifdef around power management methodsFabio Estevam1-4/+2
We can annonate the suspend/resume functions with '__maybe_unused' and get rid of the ifdef, which makes the code smaller and simpler. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-30Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEPFabio Estevam1-1/+1
When a kernel has CONFIG_PM=y and CONFIG_PM_SLEEP=n the following warnings are seen: drivers/input/touchscreen/mcs5000_ts.c:252:12: warning: 'mcs5000_ts_suspend' defined but not used [-Wunused-function] static int mcs5000_ts_suspend(struct device *dev) ^ drivers/input/touchscreen/mcs5000_ts.c:262:12: warning: 'mcs5000_ts_resume' defined but not used [-Wunused-function] static int mcs5000_ts_resume(struct device *dev) Protect the suspend/resume functions with CONFIG_PM_SLEEP in order to fix these build warnings. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-30Input: ads7846 - release resources on failure for clean exitPramod Gurav1-2/+4
Input device must be released(input_free_device) when ads7846_probe_dt fails. This fixes the same by releasing resources on failure. Signed-off-by: Pramod Gurav <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28Input: wacom - add support for 0x12C ISDv4 sensorJason Gerecke1-0/+4
Signed-off-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28Input: atmel_mxt_ts - use deep sleep mode when stoppedNick Dyer1-26/+73
By writing zero to both the active and idle cycle times the maXTouch device is put into a deep sleep mode when it consumes minimal power. It is unnecessary to change the configuration of any other objects (for example to disable T9 touchscreen). It is counterproductive to reset the chip on resume, it will result in a long delay. However it is necessary to issue a calibrate command after the chip has spent any time in deep sleep. This patch also deals with the situation where the power configuration is zero on probe, which would mean that the device never wakes up to execute commands. Signed-off-by: Nick Dyer <[email protected]> Acked-by: Benson Leung <[email protected]> Acked-by: Yufeng Shen <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28ARM: dts: am437x-gp-evm: Update binding for touchscreen sizeRoger Quadros1-2/+2
Update the bindings for touchscreen size. Signed-off-by: Roger Quadros <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28ARM: dts: am43x-epos-evm: Update binding for touchscreen sizeRoger Quadros1-2/+2
Update the bindings for touchscreen size. Signed-off-by: Roger Quadros <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28Input: pixcir_i2c_ts - add device tree supportRoger Quadros3-0/+104
Provide device tree support and binding information. Also provide support for a new chip "pixcir_tangoc". Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28Input: pixcir_i2c_ts - support up to 5 fingers and hardware tracking IDsRoger Quadros2-17/+69
Some variants of the Pixcir touch controller support up to 5 simultaneous fingers and hardware tracking IDs. Prepare the driver for that. Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-28Input: pixcir_i2c_ts - use Type-B Multi-Touch protocolRoger Quadros1-31/+94
Switch to using the Type-B Multi-Touch protocol. Reviewed-by: Henrik Rydberg <[email protected]> Signed-off-by: Roger Quadros <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - add support for v7 devicesYunkang Tang2-3/+280
Such as found on the new Toshiba Portégé Z30-A and Z40-A. Signed-off-by: Yunkang Tang <[email protected]> [[email protected]: Remove softbutton handling, this is done in userspace] [[email protected]: Report INPUT_PROP_BUTTONPAD] [[email protected]: Do not report fake PRESSURE, reporting BTN_TOUCH is enough] [[email protected]: Various cleanups / refactoring] Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - cache firmware versionHans de Goede2-0/+5
Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - change decode function prototype to return an intHans de Goede2-4/+10
So that decode functions can return a failure when appropriate. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - report 2 touches when we've > 2 fingersHans de Goede1-1/+1
If we detect more then 2 fingers report 2 touches, rather then only reporting the upper left corner of the bounding box. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - add an alps_report_semi_mt_data functionHans de Goede1-47/+29
Move all the semi-mt specific handling shared between the v3 and v4 handling code to a common helper function. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - use single touch data when v3 mt data contains only one fingerHans de Goede1-1/+1
For v3 protocol devices, use the more accurate single touch data when the mt data contains only one finger. Note the mt data reporting a finger count of 1 should never happen, but better safe then sorry. This brings the v3 bitmap handling in line with what the v4 code does, allowing to factor out the common bits into a helper function. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - use standard contact tracking instead of DIYHans de Goede1-36/+16
When there are 2 fingers on the pad we don't know which one is which, so use input_mt_assign_slots to make sure the right set of coordinates ends up in the right slot. Besides ensuring things end up in the right slot, this also results in a nice cleanup, since sync_frame also handles non mt position and btn_touch reporting. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - use struct input_mt_pos to track coordinatesHans de Goede2-122/+104
This is a preparation patch for switching the DIY mt handling to using input_mt_assign_slots && input_mt_sync_frame. struct alps_fields is quite large, so while making changes to almost all uses of it lets put it in our priv data instead of on the stack. Having it in our priv data also allows using it directly for storing values which need to be cached, rather then having separate x, y, z, fingers, etc. copies in our priv data. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - process_bitmap: round down when spreading adjescent fingers ↵Hans de Goede1-2/+2
over 2 points This fixes 2 fingers at the same height or width on the touchpad getting reported at different y / x coordinates. Note num_bits is always at least 1. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - process_bitmap: fix counting of high point bitsHans de Goede1-2/+1
alps_process_bitmap was resetting the point bit-count as soon as it saw 2 0 bits in a row. This means that unless the high point actually is at the end of the bitmap, it would always get its num_bits set to 0. Instead reset num_bits to 0 on a 0->1 transition, so that with > 2 fingers we only count the number of bits occupied by the highest finger. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - process_bitmap: add alps_get_bitmap_points() helper functionHans de Goede2-45/+35
Factor out the identical code for getting the bitmap points for x and y into a helper function. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - process_bitmap: don't invert the Y-axis on RushmoreHans de Goede2-9/+12
Rushmore models don't have the Y-axis data in the bitmap inverted. Since we now have 2 different Y orientations, make the Y bitmap data processing use a forward loop like the X bitmap data processing, unifying the 2, and invert the data later, except on Rushmore. So far no-one has noticed this because the synaptics driver only uses the non mt coordinates (except on clickpads, and there are no alps clickpads using process_bitmap). Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - improve 2-finger reporting on v3 modelsHans de Goede1-36/+24
V3 models only report mt bitmap data when there are 2 or more fingers on the touchpad. So always generate 2 positions in alps_process_bitmap, and for v3 models only fall back to st data when there was no mt data in a mt packet (which should never happen). This fixes 2 finger scrolling not working when using 2 fingers close to each other. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-26Input: alps - fix rushmore packet decodingYunkang Tang1-0/+3
Signed-off-by: Yunkang Tang <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: soc_button_array - add missing memory allocation checkPramod Gurav1-0/+3
Signed-off-by: Pramod Gurav <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - register an ac power supply for wireless devicesBenjamin Tissoires3-5/+55
This is used by HID Bluetooth devices but also add some more information to the USB Wireless Receiver. We are just porting the bits from hid-wacom.c to the common driver here. Signed-off-by: Benjamin Tissoires <[email protected]> Acked-by: Przemo Firszt <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - use a uniq name for the battery deviceBenjamin Tissoires2-1/+6
The current implementation uses "wacom_battery" as a generic name for batteries. This prevents us to have two Wacom devices with a battery attached as the power system will complain about the name which is already registered. Use an incremental name for each battery attached. Related bug: https://sourceforge.net/p/linuxwacom/bugs/248/ Signed-off-by: Benjamin Tissoires <[email protected]> Acked-by: Przemo Firszt <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - enhance Wireless Receiver battery reportingBenjamin Tissoires4-8/+43
- Reports the current status of the battery (discharging, charging, full). - Also notify the upower daemon when there is a change in the battery value. - keep the battery value as a percentage, not the raw value - add WACOM_QUIRK_BATTERY to easily add a battery to a device (required for Bluetooth devices) Signed-off-by: Benjamin Tissoires <[email protected]> Acked-by: Przemo Firszt <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - put a flag when the led are initializedBenjamin Tissoires2-0/+7
This solves a bug with the wireless receiver: - at plug, the wireless receiver does not know which Wacom device it is connected to, so it does not actually creates all the LEDs - when the tablet connects, wacom->wacom_wac.features.type is set to the proper device so that wacom_wac can understand the packets - when the receiver is unplugged, it detects that a LED should have been created (based on wacom->wacom_wac.features.type) and tries to remove it: crash when removing the sysfs group. Side effect, we can now safely call several times wacom_destroy_leds(). Signed-off-by: Benjamin Tissoires <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - support up to 2048 pressure levels with ISDv4Jason Gerecke1-1/+1
Signed-off-by: Jason Gerecke <[email protected]> Signed-off-by: Benjamin Tissoires <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - move the USB (now hid) Wacom driver in drivers/hidBenjamin Tissoires8-19/+16
wacom.ko is now a full HID driver, we have to move it into the proper subdirectory: drivers/hid. Signed-off-by: Benjamin Tissoires <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - keep wacom_ids orderedBenjamin Tissoires1-40/+39
No Functional changes, just some reordering. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Tested-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - remove field pktlen declaration in the list of devicesBenjamin Tissoires2-269/+247
pktlen is now overwritten by the driver directly by reading the hid report descriptor. There is no need to declare it statically. We also move down the position of the field in the struct so that we can keep the current declaration of Wacom devices. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Tested-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - use hidinput_calc_abs_res instead of duplicating its codeBenjamin Tissoires1-39/+9
This may infer a small difference with the previous implementation due to the DIV_ROUND_CLOSEST() in the hid implementation. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Tested-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2014-07-25Input: wacom - use in-kernel HID parserBenjamin Tissoires2-238/+114
HID already parses the report descriptor, so use it instead of implementing our own. The special case for Bamboo PT 3rd gen is also removed and handled in the same way Intuos 5 is treated, by hardcoding it in the driver. Last, the unit_exponent stored into the hid field already is signed, so there is no need to handle a two's complement anymore. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Jason Gerecke <[email protected]> Tested-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.