Merge tag 'v4.20' into next

Merge with mainline to bring in the new APIs.

diff --cc Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
index f517660a3204cf15ce417ceae23e00ad729a0c4f,0c252d9306dab31dfbe748e3c855215602c66de2..ef2ae729718f8d005565b532d0c5c1df4a88c6a5
--- 1/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
--- 2/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

diff --cc drivers/clk/mmp/clk-of-mmp2.c
Simple merge

diff --cc drivers/input/misc/rotary_encoder.c
Simple merge

diff --cc drivers/input/serio/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge