Permalink
Browse files

Merge branch 'for-linus' of 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: (68 commits)
  Input: adp5589-keys - add support for the ADP5585 derivatives
  Input: imx_keypad - add pm suspend and resume support
  Input: force feedback - potential integer wrap in input_ff_create()
  Input: tsc2007 - make sure that X plate resistance is specified
  Input: serio_raw - fix memory leak when closing char device
  Input: serio_raw - kick clients when disconnecting port
  Input: serio_raw - explicitly mark disconnected ports as dead
  Input: serio_raw - fix coding style issues
  Input: serio_raw - use dev_*() for messages
  Input: serio_raw - use bool for boolean data
  Input: serio_raw - perform proper locking when adding clients to list
  Input: serio_raw - rename serio_raw_list to serio_raw_client
  Input: serio_raw - use kref instead of rolling out its own refcounting
  Input: psmouse - switch to using dev_*() for messages
  Input: wacom - correct max Y value on medium bamboos
  Input: wacom - add ABS_DISTANCE to Bamboo Pen reports
  Input: wacom - remove unneeded touch pressure initialization
  Input: lm8323 - wrap suspend and resume in CONFIG_PM_SLEEP
  Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
  Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP
  ...
  • Loading branch information...
2 parents 1897436 + 6ad390a commit 396e6e49c58bb23d1814d3c240c736c9f01523c5 @torvalds torvalds committed Oct 27, 2011
Showing with 4,531 additions and 966 deletions.
  1. +72 −0 Documentation/ABI/testing/sysfs-driver-wacom
  2. +0 −10 Documentation/ABI/testing/sysfs-wacom
  3. +279 −16 Documentation/input/elantech.txt
  4. +14 −0 Documentation/input/multi-touch-protocol.txt
  5. +8 −3 drivers/input/ff-core.c
  6. +1 −0 drivers/input/input-mt.c
  7. +4 −2 drivers/input/input-polldev.c
  8. +2 −2 drivers/input/keyboard/Kconfig
  9. +1 −1 drivers/input/keyboard/adp5588-keys.c
  10. +482 −127 drivers/input/keyboard/adp5589-keys.c
  11. +1 −1 drivers/input/keyboard/davinci_keyscan.c
  12. +1 −1 drivers/input/keyboard/ep93xx_keypad.c
  13. +13 −11 drivers/input/keyboard/gpio_keys.c
  14. +45 −1 drivers/input/keyboard/imx_keypad.c
  15. +1 −1 drivers/input/keyboard/jornada720_kbd.c
  16. +1 −1 drivers/input/keyboard/lm8323.c
  17. +0 −1 drivers/input/keyboard/matrix_keypad.c
  18. +1 −1 drivers/input/keyboard/pxa27x_keypad.c
  19. +1 −1 drivers/input/keyboard/pxa930_rotary.c
  20. +1 −1 drivers/input/keyboard/tc3589x-keypad.c
  21. +53 −32 drivers/input/keyboard/tegra-kbc.c
  22. +1 −1 drivers/input/keyboard/w90p910_keypad.c
  23. +34 −11 drivers/input/misc/Kconfig
  24. +3 −1 drivers/input/misc/Makefile
  25. +2 −2 drivers/input/misc/ad714x-i2c.c
  26. +691 −0 drivers/input/misc/bma150.c
  27. +1 −1 drivers/input/misc/ixp4xx-beeper.c
  28. +10 −10 drivers/input/misc/mma8450.c
  29. +296 −0 drivers/input/misc/pm8xxx-vibrator.c
  30. +1 −1 drivers/input/misc/twl6040-vibra.c
  31. +25 −27 drivers/input/mouse/alps.c
  32. +621 −113 drivers/input/mouse/elantech.c
  33. +40 −17 drivers/input/mouse/elantech.h
  34. +43 −41 drivers/input/mouse/hgpk.c
  35. +0 −11 drivers/input/mouse/hgpk.h
  36. +3 −3 drivers/input/mouse/lifebook.c
  37. +8 −8 drivers/input/mouse/logips2pp.c
  38. +39 −28 drivers/input/mouse/psmouse-base.c
  39. +25 −0 drivers/input/mouse/psmouse.h
  40. +1 −1 drivers/input/mouse/pxa930_trkball.c
  41. +7 −6 drivers/input/mouse/sentelic.c
  42. +524 −86 drivers/input/mouse/synaptics.c
  43. +25 −2 drivers/input/mouse/synaptics.h
  44. +2 −2 drivers/input/mouse/synaptics_i2c.c
  45. +125 −90 drivers/input/serio/serio_raw.c
  46. +8 −2 drivers/input/tablet/wacom.h
  47. +326 −30 drivers/input/tablet/wacom_sys.c
  48. +27 −21 drivers/input/tablet/wacom_wac.c
  49. +12 −0 drivers/input/touchscreen/Kconfig
  50. +1 −0 drivers/input/touchscreen/Makefile
  51. +2 −4 drivers/input/touchscreen/ad7879-i2c.c
  52. +15 −6 drivers/input/touchscreen/atmel_mxt_ts.c
  53. +1 −1 drivers/input/touchscreen/atmel_tsadcc.c
  54. +2 −2 drivers/input/touchscreen/h3600_ts_input.c
  55. +1 −1 drivers/input/touchscreen/hp680_ts_input.c
  56. +1 −1 drivers/input/touchscreen/jornada720_ts.c
  57. +1 −1 drivers/input/touchscreen/lpc32xx_ts.c
  58. +176 −23 drivers/input/touchscreen/penmount.c
  59. +1 −1 drivers/input/touchscreen/s3c2410_ts.c
  60. +109 −91 drivers/input/touchscreen/tsc2007.c
  61. +184 −0 drivers/input/touchscreen/tsc40.c
  62. +1 −1 drivers/input/touchscreen/w90p910_ts.c
  63. +24 −5 drivers/input/touchscreen/wacom_w8001.c
  64. +46 −0 include/linux/bma150.h
  65. +1 −1 include/linux/i2c/tsc2007.h
  66. +2 −1 include/linux/input.h
  67. +66 −91 include/linux/input/adp5589.h
  68. +14 −7 include/linux/input/adxl34x.h
  69. +1 −0 include/linux/serio.h
  70. +1 −1 include/linux/uinput.h
@@ -0,0 +1,72 @@
+What: /sys/class/hidraw/hidraw*/device/speed
+Date: April 2010
+Kernel Version: 2.6.35
+Contact: linux-bluetooth@vger.kernel.org
+Description:
+ The /sys/class/hidraw/hidraw*/device/speed file controls
+ reporting speed of Wacom bluetooth tablet. Reading from
+ this file returns 1 if tablet reports in high speed mode
+ or 0 otherwise. Writing to this file one of these values
+ switches reporting speed.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/led
+Date: August 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ Attribute group for control of the status LEDs and the OLEDs.
+ This attribute group is only available for Intuos 4 M, L,
+ and XL (with LEDs and OLEDs) and Cintiq 21UX2 (LEDs only).
+ Therefore its presence implicitly signifies the presence of
+ said LEDs and OLEDs on the tablet device.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance
+Date: August 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ Writing to this file sets the status LED luminance (1..127)
+ when the stylus does not touch the tablet surface, and no
+ button is pressed on the stylus. This luminance level is
+ normally lower than the level when a button is pressed.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status1_luminance
+Date: August 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ Writing to this file sets the status LED luminance (1..127)
+ when the stylus touches the tablet surface, or any button is
+ pressed on the stylus.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0_select
+Date: August 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ Writing to this file sets which one of the four (for Intuos 4)
+ or of the right four (for Cintiq 21UX2) status LEDs is active (0..3).
+ The other three LEDs on the same side are always inactive.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select
+Date: September 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ Writing to this file sets which one of the left four (for Cintiq 21UX2)
+ status LEDs is active (0..3). The other three LEDs on the left are always
+ inactive.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance
+Date: August 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ Writing to this file sets the overall luminance level (0..15)
+ of all eight button OLED displays.
+
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/button<n>_rawimg
+Date: August 2011
+Contact: linux-input@vger.kernel.org
+Description:
+ When writing a 1024 byte raw image in Wacom Intuos 4
+ interleaving format to the file, the image shows up on Button N
+ of the device. The image is a 64x32 pixel 4-bit gray image. The
+ 1024 byte binary is split up into 16x 64 byte chunks. Each 64
+ byte chunk encodes the image data for two consecutive lines on
+ the display. The low nibble of each byte contains the first
+ line, and the high nibble contains the second line.
@@ -1,10 +0,0 @@
-What: /sys/class/hidraw/hidraw*/device/speed
-Date: April 2010
-Kernel Version: 2.6.35
-Contact: linux-bluetooth@vger.kernel.org
-Description:
- The /sys/class/hidraw/hidraw*/device/speed file controls
- reporting speed of wacom bluetooth tablet. Reading from
- this file returns 1 if tablet reports in high speed mode
- or 0 otherwise. Writing to this file one of these values
- switches reporting speed.
Oops, something went wrong.

0 comments on commit 396e6e4

Please sign in to comment.