From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Oct 2018 17:20:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v5.4-rc1~2340
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed3f4e239834317934cc73a187e27e44b217056b;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull input updates from Dmitry Torokhov:
 "Just random driver fixups, nothing exiting"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - avoid using uninitialized variable when probing
  Input: xen-kbdfront - mark expected switch fall-through
  Input: atmel_mxt_ts - mark expected switch fall-through
  Input: cyapa - mark expected switch fall-throughs
  Input: wm97xx-ts - fix exit path
  Input: of_touchscreen - add support for touchscreen-min-x|y
  Input: Fix DIR-685 touchkeys MAINTAINERS entry
  Input: elants_i2c - use DMA safe i2c when possible
  Input: silead - try firmware reload after unsuccessful resume
  Input: st1232 - set INPUT_PROP_DIRECT property
  Input: xilinx_ps2 - convert to using %pOFn instead of device_node.name
  Input: atmel_mxt_ts - fix multiple <linux/property.h> includes
  Input: sun4i-lradc - convert to using %pOFn instead of device_node.name
  Input: pwm-vibrator - correct pwms in DT binding example
---

ed3f4e239834317934cc73a187e27e44b217056b
diff --cc Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
index d092d5d,8aff955..8641a2d
--- a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
@@@ -1,15 -1,14 +1,17 @@@
  General Touchscreen Properties:
  
  Optional properties for Touchscreens:
+  - touchscreen-min-x		: minimum x coordinate reported (0 if not set)
+  - touchscreen-min-y		: minimum y coordinate reported (0 if not set)
   - touchscreen-size-x		: horizontal resolution of touchscreen
- 				  (in pixels)
+ 				  (maximum x coordinate reported + 1)
   - touchscreen-size-y		: vertical resolution of touchscreen
- 				  (in pixels)
+ 				  (maximum y coordinate reported + 1)
   - touchscreen-max-pressure	: maximum reported pressure (arbitrary range
  				  dependent on the controller)
 + - touchscreen-min-pressure	: minimum pressure on the touchscreen to be
 +				  achieved in order for the touchscreen
 +				  driver to report a touch event.
   - touchscreen-fuzz-x		: horizontal noise value of the absolute input
  				  device (in pixels)
   - touchscreen-fuzz-y		: vertical noise value of the absolute input