Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem updates from Dmitry Torokhov:
 "You will get the following new drivers:

   - Qualcomm PM8941 power key drver
   - ChipOne icn8318 touchscreen controller driver
   - Broadcom iProc touchscreen and keypad drivers
   - Semtech SX8654 I2C touchscreen controller driver

  ALPS driver now supports newer SS4 devices; Elantech got a fix that
  should make it work on some ASUS laptops; and a slew of other
  enhancements and random fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (51 commits)
  Input: alps - non interleaved V2 dualpoint has separate stick button bits
  Input: alps - fix touchpad buttons getting stuck when used with trackpoint
  Input: atkbd - document "no new force-release quirks" policy
  Input: ALPS - make alps_get_pkt_id_ss4_v2() and others static
  Input: ALPS - V7 devices can report 5-finger taps
  Input: ALPS - add support for SS4 touchpad devices
  Input: ALPS - refactor alps_set_abs_params_mt()
  Input: elantech - fix absolute mode setting on some ASUS laptops
  Input: atmel_mxt_ts - split out touchpad initialisation logic
  Input: atmel_mxt_ts - implement support for T100 touch object
  Input: cros_ec_keyb - fix clearing keyboard state on wakeup
  Input: gscps2 - drop pci_ids dependency
  Input: synaptics - allocate 3 slots to keep stability in image sensors
  Input: Revert "Revert "synaptics - use dmax in input_mt_assign_slots""
  Input: MT - make slot assignment work for overcovered solutions
  mfd: tc3589x: enforce device-tree only mode
  Input: tc3589x - localize platform data
  Input: tsc2007 - Convert msecs to jiffies only once
  Input: edt-ft5x06 - remove EV_SYN event report
  Input: edt-ft5x06 - allow to setting the maximum axes value through the DT
  ...

1 files changed, 29 insertions, 7 deletions

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index ca196689f025..3af16984d57c 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -23,6 +23,8 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
+#include <linux/of.h>
 #include <asm/unaligned.h>
 
 struct goodix_ts_data {
@@ -48,6 +50,7 @@ struct goodix_ts_data {
 #define GOODIX_REG_VERSION              0x8140
 
 #define RESOLUTION_LOC          1
+#define MAX_CONTACTS_LOC        5
 #define TRIGGER_LOC             6
 
 static const unsigned long goodix_irq_flags[] = {
@@ -99,7 +102,7 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
         }
 
         touch_num = data[0] & 0x0f;
-        if (touch_num > GOODIX_MAX_CONTACTS)
+        if (touch_num > ts->max_touch_num)
                 return -EPROTO;
 
         if (touch_num > 1) {
@@ -141,7 +144,7 @@ static void goodix_ts_report_touch(struct goodix_ts_data *ts, u8 *coor_data)
  */
 static void goodix_process_events(struct goodix_ts_data *ts)
 {
-        u8  point_data[1 + GOODIX_CONTACT_SIZE * GOODIX_MAX_CONTACTS];
+        u8  point_data[1 + GOODIX_CONTACT_SIZE * ts->max_touch_num];
         int touch_num;
         int i;
 
@@ -202,21 +205,23 @@ static void goodix_read_config(struct goodix_ts_data *ts)
                 ts->abs_x_max = GOODIX_MAX_WIDTH;
                 ts->abs_y_max = GOODIX_MAX_HEIGHT;
                 ts->int_trigger_type = GOODIX_INT_TRIGGER;
+                ts->max_touch_num = GOODIX_MAX_CONTACTS;
                 return;
         }
 
         ts->abs_x_max = get_unaligned_le16(&config[RESOLUTION_LOC]);
         ts->abs_y_max = get_unaligned_le16(&config[RESOLUTION_LOC + 2]);
-        ts->int_trigger_type = (config[TRIGGER_LOC]) & 0x03;
-        if (!ts->abs_x_max || !ts->abs_y_max) {
+        ts->int_trigger_type = config[TRIGGER_LOC] & 0x03;
+        ts->max_touch_num = config[MAX_CONTACTS_LOC] & 0x0f;
+        if (!ts->abs_x_max || !ts->abs_y_max || !ts->max_touch_num) {
                 dev_err(&ts->client->dev,
                         "Invalid config, using defaults\n");
                 ts->abs_x_max = GOODIX_MAX_WIDTH;
                 ts->abs_y_max = GOODIX_MAX_HEIGHT;
+                ts->max_touch_num = GOODIX_MAX_CONTACTS;
         }
 }
 
-
 /**
  * goodix_read_version - Read goodix touchscreen version
  *
@@ -295,7 +300,7 @@ static int goodix_request_input_dev(struct goodix_ts_data *ts)
         input_set_abs_params(ts->input_dev, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0);
         input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
 
-        input_mt_init_slots(ts->input_dev, GOODIX_MAX_CONTACTS,
+        input_mt_init_slots(ts->input_dev, ts->max_touch_num,
                             INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);
 
         ts->input_dev->name = "Goodix Capacitive TouchScreen";
@@ -372,11 +377,27 @@ static const struct i2c_device_id goodix_ts_id[] = {
         { }
 };
 
+#ifdef CONFIG_ACPI
 static const struct acpi_device_id goodix_acpi_match[] = {
         { "GDIX1001", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(acpi, goodix_acpi_match);
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id goodix_of_match[] = {
+        { .compatible = "goodix,gt911" },
+        { .compatible = "goodix,gt9110" },
+        { .compatible = "goodix,gt912" },
+        { .compatible = "goodix,gt927" },
+        { .compatible = "goodix,gt9271" },
+        { .compatible = "goodix,gt928" },
+        { .compatible = "goodix,gt967" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, goodix_of_match);
+#endif
 
 static struct i2c_driver goodix_ts_driver = {
         .probe = goodix_ts_probe,
@@ -384,7 +405,8 @@ static struct i2c_driver goodix_ts_driver = {
         .driver = {
                 .name = "Goodix-TS",
                 .owner = THIS_MODULE,
-                .acpi_match_table = goodix_acpi_match,
+                .acpi_match_table = ACPI_PTR(goodix_acpi_match),
+                .of_match_table = of_match_ptr(goodix_of_match),
         },
 };
 module_i2c_driver(goodix_ts_driver);