3 files changed, 4 insertions, 2 deletions

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 6d6b092e2da9..d6135900da64 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1258,6 +1258,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
         { "ELAN0605", 0 },
         { "ELAN0609", 0 },
         { "ELAN060B", 0 },
+        { "ELAN060C", 0 },
         { "ELAN0611", 0 },
         { "ELAN1000", 0 },
         { }
diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c
index 225025a0940c..b6ccf39c6a7b 100644
--- a/drivers/input/rmi4/rmi_smbus.c
+++ b/drivers/input/rmi4/rmi_smbus.c
@@ -312,7 +312,7 @@ static int rmi_smb_probe(struct i2c_client *client,
         rmi_smb->xport.dev = &client->dev;
         rmi_smb->xport.pdata = *pdata;
         rmi_smb->xport.pdata.irq = client->irq;
-        rmi_smb->xport.proto_name = "smb2";
+        rmi_smb->xport.proto_name = "smb";
         rmi_smb->xport.ops = &rmi_smb_ops;
 
         smbus_version = rmi_smb_get_version(rmi_smb);
@@ -322,7 +322,7 @@ static int rmi_smb_probe(struct i2c_client *client,
         rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d",
                 smbus_version);
 
-        if (smbus_version != 2) {
+        if (smbus_version != 2 && smbus_version != 3) {
                 dev_err(&client->dev, "Unrecognized SMB version %d\n",
                                 smbus_version);
                 return -ENODEV;
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c
index 88ea5e1b72ae..abf27578beb1 100644
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
@@ -531,6 +531,7 @@ int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
 
         input_set_drvdata(input_dev, ts);
 
+        __set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
         input_set_capability(input_dev, EV_KEY, BTN_TOUCH);
 
         input_set_abs_params(input_dev, ABS_X,