Merge branch 'next' into for-linus

Prepare input updates for 4.20 merge window.

diff --combined MAINTAINERS
index 57eba2829a6c7cb5d3ca197fea74527200bac239,18e96de359e4cca3340b05acc1315cb0b14e4b25..fb742af4443097aa34018fde079976a6362467cd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3953,7 -3953,7 +3953,7 @@@ D-LINK DIR-685 TOUCHKEYS DRIVE
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    drivers/input/dlink-dir685-touchkeys.c
+ F:    drivers/input/keyboard/dlink-dir685-touchkeys.c
  
  DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
  M:    Joshua Kinard <[email protected]>
@@@ -7010,7 -7010,6 +7010,7 @@@ F:      include/uapi/linux/input.
  F:    include/uapi/linux/input-event-codes.h
  F:    include/linux/input/
  F:    Documentation/devicetree/bindings/input/
 +F:    Documentation/devicetree/bindings/serio/
  F:    Documentation/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
@@@ -11045,13 -11044,6 +11045,13 @@@ S: Maintaine
  F:    include/linux/personality.h
  F:    include/uapi/linux/personality.h
  
 +PHOENIX RC FLIGHT CONTROLLER ADAPTER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/input/devices/pxrc.rst
 +F:    drivers/input/joystick/pxrc.c
 +
  PHONET PROTOCOL
  M:    Remi Denis-Courmont <[email protected]>
  S:    Supported

diff --combined drivers/input/touchscreen/silead.c
index d196ac3d8b8cda8e1cf405101ed5603473db821d,da1fdd16855e1126f7a80b18af48e7f39a4e1990..09241d4cdebca340625f5e08345b10b7822114e0
--- 1/drivers/input/touchscreen/silead.c
--- 2/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@@ -558,20 -558,33 +558,33 @@@ static int __maybe_unused silead_ts_sus
  static int __maybe_unused silead_ts_resume(struct device *dev)
  {
        struct i2c_client *client = to_i2c_client(dev);
+       bool second_try = false;
        int error, status;
  
        silead_ts_set_power(client, SILEAD_POWER_ON);
  
+  retry:
        error = silead_ts_reset(client);
        if (error)
                return error;
  
+       if (second_try) {
+               error = silead_ts_load_fw(client);
+               if (error)
+                       return error;
+       }
+ 
        error = silead_ts_startup(client);
        if (error)
                return error;
  
        status = silead_ts_get_status(client);
        if (status != SILEAD_STATUS_OK) {
+               if (!second_try) {
+                       second_try = true;
+                       dev_dbg(dev, "Reloading firmware after unsuccessful resume\n");
+                       goto retry;
+               }
                dev_err(dev, "Resume error, status: 0x%02x\n", status);
                return -ENODEV;
        }
@@@ -603,7 -616,6 +616,7 @@@ static const struct acpi_device_id sile
        { "GSL3692", 0 },
        { "MSSL1680", 0 },
        { "MSSL0001", 0 },
 +      { "MSSL0002", 0 },
        { }
  };
  MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);