Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a12fa9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents d25e436c 0337966d

Documentation/conf.py

+2 −0
Original line number Diff line number Diff line
@@ -348,6 +348,8 @@ latex_documents = [ 
     'The kernel development community', 'manual'),

    ('driver-api/index', 'driver-api.tex', 'The kernel driver API manual',

     'The kernel development community', 'manual'),

    ('input/index', 'linux-input.tex', 'The Linux input driver subsystem',

     'The kernel development community', 'manual'),

    ('kernel-documentation', 'kernel-documentation.tex', 'The Linux Kernel Documentation',

     'The kernel development community', 'manual'),

    ('process/index', 'development-process.tex', 'Linux Kernel Development Documentation',

Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ Optional Properties: 
- debounce-delay-ms:	debounce interval in milliseconds

- col-scan-delay-us:	delay, measured in microseconds, that is needed

			before we can scan keypad after activating column gpio

- drive-inactive-cols:	drive inactive columns during scan,

			default is to turn inactive columns into inputs.



Example:

	matrix-keypad {

Documentation/devicetree/bindings/input/pwm-beeper.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 


Optional properties:

- amp-supply: phandle to a regulator that acts as an amplifier for the beeper

- beeper-hz:  bell frequency in Hz



Example:

Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ PROPERTIES 
	Value type: <string>

	Definition: must be one of:

		    "qcom,pm8058-vib"

		    "qcom,pm8916-vib"

		    "qcom,pm8921-vib"



- reg:

Documentation/devicetree/bindings/input/rotary-encoder.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Optional properties: 
- rotary-encoder,relative-axis: register a relative axis rather than an

  absolute one. Relative axis will only generate +1/-1 events on the input

  device, hence no steps need to be passed.

- rotary-encoder,rollover: Automatic rollove when the rotary value becomes

- rotary-encoder,rollover: Automatic rollover when the rotary value becomes

  greater than the specified steps or smaller than 0. For absolute axis only.

- rotary-encoder,steps-per-period: Number of steps (stable states) per period.

  The values have the following meaning: