Merge branch 'next' into for-linus

Prepare second round of input updates for 5.3 merge window.

diff --combined drivers/input/mouse/synaptics.c
index 68fd8232d44cf9387e19589fb5152969b9bca1ff,b77b18c9ad024c09fee7cebd2aeb77ab12521a8a..b1956ed4c0ddeaf35b1f3cf65c0773e851a7c07d
--- 1/drivers/input/mouse/synaptics.c
--- 2/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@@ -1,3 -1,4 +1,4 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /*
   * Synaptics TouchPad PS/2 mouse driver
   *
@@@ -16,10 -17,6 +17,6 @@@
   *   Copyright (c) 1998-2000 Bruce Kalk <kall@compass.com>
   *     code for the special synaptics commands (from the tpconfig-source)
   *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
   * Trademarks are the property of their respective owners.
   */
  
@@@ -176,9 -173,9 +173,10 @@@ static const char * const smbus_pnp_ids
        "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */
        "LEN0073", /* X1 Carbon G5 (Elantech) */
        "LEN0092", /* X1 Carbon 6 */
 +      "LEN0093", /* T480 */
        "LEN0096", /* X280 */
        "LEN0097", /* X280 -> ALPS trackpoint */
+       "LEN009b", /* T580 */
        "LEN200f", /* T450s */
        "LEN2054", /* E480 */
        "LEN2055", /* E580 */
@@@ -708,7 -705,7 +706,7 @@@ static void synaptics_pt_create(struct 
  
        serio->id.type = SERIO_PS_PSTHRU;
        strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name));
-       strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->name));
+       strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys));
        serio->write = synaptics_pt_write;
        serio->start = synaptics_pt_start;
        serio->stop = synaptics_pt_stop;

diff --combined drivers/input/touchscreen/atmel_mxt_ts.c
index 6f4f9da0515cc7b601fb8355db7be2bc44add676,0dae381c663763a41218d284006684676bc751d0..4a5f482cf1af5550e6f504b11c3bdf44d4319b67
--- 1/drivers/input/touchscreen/atmel_mxt_ts.c
--- 2/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@@ -1,3 -1,4 +1,4 @@@
+ // SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Atmel maXTouch Touchscreen driver
   *
@@@ -7,12 -8,6 +8,6 @@@
   * Copyright (C) 2016 Zodiac Inflight Innovations
   *
   * Author: Joonyoung Shim <jy0922.shim@samsung.com>
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-  * Free Software Foundation;  either version 2 of the  License, or (at your
-  * option) any later version.
-  *
   */
  
  #include <linux/acpi.h>
@@@ -1516,8 -1511,7 +1511,8 @@@ static int mxt_update_cfg(struct mxt_da
                } else if (config_crc == data->config_crc) {
                        dev_dbg(dev, "Config CRC 0x%06X: OK\n",
                                 data->config_crc);
 -                      return 0;
 +                      ret = 0;
 +                      goto release_raw;
                } else {
                        dev_info(dev, "Config CRC 0x%06X: does not match file 0x%06X\n",
                                 data->config_crc, config_crc);