From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 May 2017 19:38:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v4.12-rc1~109
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=16a12fa9aed176444fc795b09e796be41902bb08;p=linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem updates from Dmitry Torokhov:

 - a big update from Mauro converting input documentation to ReST format

 - Synaptics PS/2 is now aware of SMBus companion devices, which means
   that we can now use native RMI4 protocol to handle touchpads, instead
   of relying on legacy PS/2 mode.

 - we removed support from BMA180 accelerometer from input devices as it
   is now handled properly by IIO

 - update to TSC2007 to corretcly report pressure

 - other miscellaneous driver fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (152 commits)
  Input: ar1021_i2c - use BIT to check for a bit
  Input: twl4030-pwrbutton - use input_set_capability() helper
  Input: twl4030-pwrbutton - use correct device for irq request
  Input: ar1021_i2c - enable touch mode during open
  Input: add uinput documentation
  dt-bindings: input: add bindings document for ar1021_i2c driver
  dt-bindings: input: rotary-encoder: fix typo
  Input: xen-kbdfront - add module parameter for setting resolution
  ARM: pxa/raumfeld: fix compile error in rotary controller resources
  Input: xpad - do not suggest writing to Dominic
  Input: xpad - don't use literal blocks inside footnotes
  Input: xpad - note that usb/devices is now at /sys/kernel/debug/
  Input: docs - freshen up introduction
  Input: docs - split input docs into kernel- and user-facing
  Input: docs - note that MT-A protocol is obsolete
  Input: docs - update joystick documentation a bit
  Input: docs - remove disclaimer/GPL notice
  Input: fix "Game console" heading level in joystick documentation
  Input: rotary-encoder - remove references to platform data from docs
  Input: move documentation for Amiga CD32
  ...
---

16a12fa9aed176444fc795b09e796be41902bb08
diff --cc Documentation/input/event-codes.rst
index 575415f4cef0,00b88f113bda..a8c0873beb95
--- a/Documentation/input/event-codes.rst
+++ b/Documentation/input/event-codes.rst
@@@ -299,16 -347,15 +347,18 @@@ The kernel does not provide button emul
  them as any other INPUT_PROP_BUTTONPAD device.
  
  INPUT_PROP_ACCELEROMETER
- -------------------------
+ ------------------------
+ 
  Directional axes on this device (absolute and/or relative x, y, z) represent
 -accelerometer data. All other axes retain their meaning. A device must not mix
 +accelerometer data. Some devices also report gyroscope data, which devices
 +can report through the rotational axes (absolute and/or relative rx, ry, rz).
 +
 +All other axes retain their meaning. A device must not mix
  regular directional axes and accelerometer axes on the same event node.
  
- Guidelines:
+ Guidelines
  ==========
+ 
  The guidelines below ensure proper single-touch and multi-finger functionality.
  For multi-touch functionality, see the multi-touch-protocol.txt document for
  more information.
diff --cc Documentation/input/ff.rst
index be742eec7aab,c30f185216a0..6a265a6934e6
--- a/Documentation/input/ff.rst
+++ b/Documentation/input/ff.rst
@@@ -106,13 -126,24 +126,25 @@@ allocate a new effect
  
  Effects are file descriptor specific.
  
- See <uapi/linux/input.h> for a description of the ff_effect struct. You should
- also find help in a few sketches, contained in files shape.fig and
- interactive.fig. You need xfig to visualize these files.
 -See <linux/input.h> for a description of the ff_effect struct. You should also
 -find help in a few sketches, contained in files shape.svg and interactive.svg:
++See <uapi/linux/input.h> for a description of the ff_effect struct.  You
++should also find help in a few sketches, contained in files shape.svg
++and interactive.svg:
+ 
+ .. figure:: shape.svg
  
- 3.3 Removing an effect from the device
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- int ioctl(int fd, EVIOCRMFF, effect.id);
+     Shape
+ 
+ .. figure:: interactive.svg
+ 
+     Interactive
+ 
+ 
+ Removing an effect from the device
+ ----------------------------------
+ 
+ ::
+ 
+     int ioctl(int fd, EVIOCRMFF, effect.id);
  
  This makes room for new effects in the device's memory. Note that this also
  stops the effect if it was playing.