From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 14 Jan 2019 06:35:32 +0000 (-0800)
Subject: Merge tag 'v4.20' into next
X-Git-Tag: v5.1-rc1~64^2~4^2~42
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4116941b7a703f8c770998bb3a59966608cb5bb2;p=linux-2.6-block.git

Merge tag 'v4.20' into next

Merge with mainline to bring in the new APIs.
---

4116941b7a703f8c770998bb3a59966608cb5bb2
diff --cc Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
index f517660a3204,0c252d9306da..ef2ae729718f
--- a/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
+++ b/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
@@@ -1,13 -1,8 +1,11 @@@
  Samsung tm2-touchkey
  
  Required properties:
 -- compatible: must be "cypress,tm2-touchkey"
 +- compatible:
 +    * "cypress,tm2-touchkey" - for the touchkey found on the tm2 board
 +    * "cypress,midas-touchkey" - for the touchkey found on midas boards
 +    * "cypress,aries-touchkey" - for the touchkey found on aries boards
  - reg: I2C address of the chip.
- - interrupt-parent: a phandle for the interrupt controller (see interrupt
- 	binding[0]).
  - interrupts: interrupt to which the chip is connected (see interrupt
  	binding[0]).
  - vcc-supply : internal regulator output. 1.8V