Merge branch 'synaptics-rmi4' into next

Merge updated Synaptics RMI4 support, including support for SMBus
controllers and flashing firmware.

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/rmi4/rmi_i2c.c
index 1ebc2c1,64a5488..082306d
--- 1/drivers/input/rmi4/rmi_i2c.c
--- 2/drivers/input/rmi4/rmi_i2c.c
+++ b/drivers/input/rmi4/rmi_i2c.c
@@@ -315,16 -254,7 +275,12 @@@ static int rmi_i2c_probe(struct i2c_cli
                        client->addr);
                return retval;
        }
 +      retval = devm_add_action_or_reset(&client->dev,
 +                                        rmi_i2c_unregister_transport,
 +                                        rmi_i2c);
 +      if (retval)
 +              return retval;
  
-       retval = rmi_i2c_init_irq(client);
-       if (retval < 0)
-               return retval;
- 
        dev_info(&client->dev, "registered rmi i2c driver at %#04x.\n",
                        client->addr);
        return 0;

diff --cc drivers/input/rmi4/rmi_spi.c
index 4ebef60,f3e9e48..69548d7
--- 1/drivers/input/rmi4/rmi_spi.c
--- 2/drivers/input/rmi4/rmi_spi.c
+++ b/drivers/input/rmi4/rmi_spi.c
@@@ -471,16 -425,7 +432,12 @@@ static int rmi_spi_probe(struct spi_dev
                dev_err(&spi->dev, "failed to register transport.\n");
                return retval;
        }
 +      retval = devm_add_action_or_reset(&spi->dev,
 +                                        rmi_spi_unregister_transport,
 +                                        rmi_spi);
 +      if (retval)
 +              return retval;
  
-       retval = rmi_spi_init_irq(spi);
-       if (retval < 0)
-               return retval;
- 
        dev_info(&spi->dev, "registered RMI SPI driver\n");
        return 0;
  }

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