Input: goodix - fix alignment issues

[karo-tx-linux.git] / drivers / input / touchscreen / goodix.c

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index ca196689f025222845af079eb578af28e4621747..099fc466bd1695a3d71489a0eb1965b13c275906 100644 (file)
--- 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[] = {
@@ -66,7 +69,7 @@ static const unsigned long goodix_irq_flags[] = {
  * @len: length of the buffer to write
  */
 static int goodix_i2c_read(struct i2c_client *client,
-                               u16 reg, u8 *buf, int len)
+                          u16 reg, u8 *buf, int len)
 {
        struct i2c_msg msgs[2];
        u16 wbuf = cpu_to_be16(reg);
@@ -75,7 +78,7 @@ static int goodix_i2c_read(struct i2c_client *client,
        msgs[0].flags = 0;
        msgs[0].addr  = client->addr;
        msgs[0].len   = 2;
-       msgs[0].buf   = (u8 *) &wbuf;
+       msgs[0].buf   = (u8 *)&wbuf;
 
        msgs[1].flags = I2C_M_RD;
        msgs[1].addr  = client->addr;
@@ -98,8 +101,11 @@ static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
                return error;
        }
 
+       if (!(data[0] & 0x80))
+               return -EAGAIN;
+
        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 +147,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;
 
@@ -193,8 +199,8 @@ static void goodix_read_config(struct goodix_ts_data *ts)
        int error;
 
        error = goodix_i2c_read(ts->client, GOODIX_REG_CONFIG_DATA,
-                             config,
-                          GOODIX_CONFIG_MAX_LENGTH);
+                               config,
+                               GOODIX_CONFIG_MAX_LENGTH);
        if (error) {
                dev_warn(&ts->client->dev,
                         "Error reading config (%d), using defaults\n",
@@ -202,21 +208,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
  *
@@ -288,14 +296,14 @@ static int goodix_request_input_dev(struct goodix_ts_data *ts)
                                  BIT_MASK(EV_KEY) |
                                  BIT_MASK(EV_ABS);
 
-       input_set_abs_params(ts->input_dev, ABS_MT_POSITION_X, 0,
-                               ts->abs_x_max, 0, 0);
-       input_set_abs_params(ts->input_dev, ABS_MT_POSITION_Y, 0,
-                               ts->abs_y_max, 0, 0);
+       input_set_abs_params(ts->input_dev, ABS_MT_POSITION_X,
+                            0, ts->abs_x_max, 0, 0);
+       input_set_abs_params(ts->input_dev, ABS_MT_POSITION_Y,
+                            0, ts->abs_y_max, 0, 0);
        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 +380,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 +408,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);