OSDN Git Service

Merge tag 'v3.16-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Jul 2014 19:36:56 +0000 (12:36 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 24 Jul 2014 19:36:56 +0000 (12:36 -0700)
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

21 files changed:
Documentation/devicetree/bindings/input/atmel,maxtouch.txt [new file with mode: 0644]
Documentation/devicetree/bindings/input/cap1106.txt [new file with mode: 0644]
Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
MAINTAINERS
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/keyboard/cap1106.c [new file with mode: 0644]
drivers/input/keyboard/max7359_keypad.c
drivers/input/misc/keyspan_remote.c
drivers/input/misc/uinput.c
drivers/input/tablet/Kconfig
drivers/input/tablet/Makefile
drivers/input/tablet/wacom_serial4.c [new file with mode: 0644]
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/input/touchscreen/edt-ft5x06.c
drivers/input/touchscreen/s3c2410_ts.c
drivers/input/touchscreen/zforce_ts.c
drivers/platform/chrome/chromeos_laptop.c
include/linux/i2c/atmel_mxt_ts.h
include/uapi/linux/serio.h
include/uapi/linux/uinput.h

diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
new file mode 100644 (file)
index 0000000..baef432
--- /dev/null
@@ -0,0 +1,25 @@
+Atmel maXTouch touchscreen/touchpad
+
+Required properties:
+- compatible:
+    atmel,maxtouch
+
+- reg: The I2C address of the device
+
+- interrupts: The sink for the touchpad's IRQ output
+    See ../interrupt-controller/interrupts.txt
+
+Optional properties for main touchpad device:
+
+- linux,gpio-keymap: An array of up to 4 entries indicating the Linux
+    keycode generated by each GPIO. Linux keycodes are defined in
+    <dt-bindings/input/input.h>.
+
+Example:
+
+       touch@4b {
+               compatible = "atmel,maxtouch";
+               reg = <0x4b>;
+               interrupt-parent = <&gpio>;
+               interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_LEVEL_LOW>;
+       };
diff --git a/Documentation/devicetree/bindings/input/cap1106.txt b/Documentation/devicetree/bindings/input/cap1106.txt
new file mode 100644 (file)
index 0000000..4b46390
--- /dev/null
@@ -0,0 +1,53 @@
+Device tree bindings for Microchip CAP1106, 6 channel capacitive touch sensor
+
+The node for this driver must be a child of a I2C controller node, as the
+device communication via I2C only.
+
+Required properties:
+
+       compatible:             Must be "microchip,cap1106"
+
+       reg:                    The I2C slave address of the device.
+                               Only 0x28 is valid.
+
+       interrupts:             Property describing the interrupt line the
+                               device's ALERT#/CM_IRQ# pin is connected to.
+                               The device only has one interrupt source.
+
+Optional properties:
+
+       autorepeat:             Enables the Linux input system's autorepeat
+                               feature on the input device.
+
+       microchip,sensor-gain:  Defines the gain of the sensor circuitry. This
+                               effectively controls the sensitivity, as a
+                               smaller delta capacitance is required to
+                               generate the same delta count values.
+                               Valid values are 1, 2, 4, and 8.
+                               By default, a gain of 1 is set.
+
+       linux,keycodes:         Specifies an array of numeric keycode values to
+                               be used for the channels. If this property is
+                               omitted, KEY_A, KEY_B, etc are used as
+                               defaults. The array must have exactly six
+                               entries.
+
+Example:
+
+i2c_controller {
+       cap1106@28 {
+               compatible = "microchip,cap1106";
+               interrupt-parent = <&gpio1>;
+               interrupts = <0 0>;
+               reg = <0x28>;
+               autorepeat;
+               microchip,sensor-gain = <2>;
+
+               linux,keycodes = <103           /* KEY_UP */
+                                 106           /* KEY_RIGHT */
+                                 108           /* KEY_DOWN */
+                                 105           /* KEY_LEFT */
+                                 109           /* KEY_PAGEDOWN */
+                                 104>;         /* KEY_PAGEUP */
+       };
+}
index 2faf1f1..80c37df 100644 (file)
@@ -9,6 +9,9 @@ Required properties:
 - x-size: horizontal resolution of touchscreen
 - y-size: vertical resolution of touchscreen
 
+Optional properties:
+- vdd-supply: Regulator controlling the controller supply
+
 Example:
 
        i2c@00000000 {
@@ -18,6 +21,7 @@ Example:
                        compatible = "neonode,zforce";
                        reg = <0x50>;
                        interrupts = <2 0>;
+                       vdd-supply = <&reg_zforce_vdd>;
 
                        gpios = <&gpio5 6 0>, /* INT */
                                <&gpio5 9 0>; /* RST */
index 61a8f48..1704720 100644 (file)
@@ -9843,6 +9843,13 @@ M:       Pierre Ossman <pierre@ossman.eu>
 S:     Maintained
 F:     drivers/mmc/host/wbsd.*
 
+WACOM PROTOCOL 4 SERIAL TABLETS
+M:     Julian Squires <julian@cipht.net>
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/input/tablet/wacom_serial4.c
+
 WATCHDOG DEVICE DRIVERS
 M:     Wim Van Sebroeck <wim@iguana.be>
 L:     linux-watchdog@vger.kernel.org
index f7e79b4..a3958c6 100644 (file)
@@ -665,4 +665,14 @@ config KEYBOARD_CROS_EC
          To compile this driver as a module, choose M here: the
          module will be called cros_ec_keyb.
 
+config KEYBOARD_CAP1106
+       tristate "Microchip CAP1106 touch sensor"
+       depends on OF && I2C
+       select REGMAP_I2C
+       help
+         Say Y here to enable the CAP1106 touch sensor driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cap1106.
+
 endif
index 7504ae1..0a33456 100644 (file)
@@ -11,6 +11,7 @@ obj-$(CONFIG_KEYBOARD_AMIGA)          += amikbd.o
 obj-$(CONFIG_KEYBOARD_ATARI)           += atakbd.o
 obj-$(CONFIG_KEYBOARD_ATKBD)           += atkbd.o
 obj-$(CONFIG_KEYBOARD_BFIN)            += bf54x-keys.o
+obj-$(CONFIG_KEYBOARD_CAP1106)         += cap1106.o
 obj-$(CONFIG_KEYBOARD_CLPS711X)                += clps711x-keypad.o
 obj-$(CONFIG_KEYBOARD_CROS_EC)         += cros_ec_keyb.o
 obj-$(CONFIG_KEYBOARD_DAVINCI)         += davinci_keyscan.o
diff --git a/drivers/input/keyboard/cap1106.c b/drivers/input/keyboard/cap1106.c
new file mode 100644 (file)
index 0000000..f7d7a0d
--- /dev/null
@@ -0,0 +1,335 @@
+/*
+ * Input driver for Microchip CAP1106, 6 channel capacitive touch sensor
+ *
+ * http://www.microchip.com/wwwproducts/Devices.aspx?product=CAP1106
+ *
+ * (c) 2014 Daniel Mack <linux@zonque.org>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/of_irq.h>
+#include <linux/regmap.h>
+#include <linux/i2c.h>
+#include <linux/gpio/consumer.h>
+
+#define CAP1106_REG_MAIN_CONTROL       0x00
+#define CAP1106_REG_MAIN_CONTROL_GAIN_SHIFT    (6)
+#define CAP1106_REG_MAIN_CONTROL_GAIN_MASK     (0xc0)
+#define CAP1106_REG_MAIN_CONTROL_DLSEEP                BIT(4)
+#define CAP1106_REG_GENERAL_STATUS     0x02
+#define CAP1106_REG_SENSOR_INPUT       0x03
+#define CAP1106_REG_NOISE_FLAG_STATUS  0x0a
+#define CAP1106_REG_SENOR_DELTA(X)     (0x10 + (X))
+#define CAP1106_REG_SENSITIVITY_CONTROL        0x1f
+#define CAP1106_REG_CONFIG             0x20
+#define CAP1106_REG_SENSOR_ENABLE      0x21
+#define CAP1106_REG_SENSOR_CONFIG      0x22
+#define CAP1106_REG_SENSOR_CONFIG2     0x23
+#define CAP1106_REG_SAMPLING_CONFIG    0x24
+#define CAP1106_REG_CALIBRATION                0x25
+#define CAP1106_REG_INT_ENABLE         0x26
+#define CAP1106_REG_REPEAT_RATE                0x28
+#define CAP1106_REG_MT_CONFIG          0x2a
+#define CAP1106_REG_MT_PATTERN_CONFIG  0x2b
+#define CAP1106_REG_MT_PATTERN         0x2d
+#define CAP1106_REG_RECALIB_CONFIG     0x2f
+#define CAP1106_REG_SENSOR_THRESH(X)   (0x30 + (X))
+#define CAP1106_REG_SENSOR_NOISE_THRESH        0x38
+#define CAP1106_REG_STANDBY_CHANNEL    0x40
+#define CAP1106_REG_STANDBY_CONFIG     0x41
+#define CAP1106_REG_STANDBY_SENSITIVITY        0x42
+#define CAP1106_REG_STANDBY_THRESH     0x43
+#define CAP1106_REG_CONFIG2            0x44
+#define CAP1106_REG_SENSOR_BASE_CNT(X) (0x50 + (X))
+#define CAP1106_REG_SENSOR_CALIB       (0xb1 + (X))
+#define CAP1106_REG_SENSOR_CALIB_LSB1  0xb9
+#define CAP1106_REG_SENSOR_CALIB_LSB2  0xba
+#define CAP1106_REG_PRODUCT_ID         0xfd
+#define CAP1106_REG_MANUFACTURER_ID    0xfe
+#define CAP1106_REG_REVISION           0xff
+
+#define CAP1106_NUM_CHN 6
+#define CAP1106_PRODUCT_ID     0x55
+#define CAP1106_MANUFACTURER_ID        0x5d
+
+struct cap1106_priv {
+       struct regmap *regmap;
+       struct input_dev *idev;
+
+       /* config */
+       unsigned int keycodes[CAP1106_NUM_CHN];
+};
+
+static const struct reg_default cap1106_reg_defaults[] = {
+       { CAP1106_REG_MAIN_CONTROL,             0x00 },
+       { CAP1106_REG_GENERAL_STATUS,           0x00 },
+       { CAP1106_REG_SENSOR_INPUT,             0x00 },
+       { CAP1106_REG_NOISE_FLAG_STATUS,        0x00 },
+       { CAP1106_REG_SENSITIVITY_CONTROL,      0x2f },
+       { CAP1106_REG_CONFIG,                   0x20 },
+       { CAP1106_REG_SENSOR_ENABLE,            0x3f },
+       { CAP1106_REG_SENSOR_CONFIG,            0xa4 },
+       { CAP1106_REG_SENSOR_CONFIG2,           0x07 },
+       { CAP1106_REG_SAMPLING_CONFIG,          0x39 },
+       { CAP1106_REG_CALIBRATION,              0x00 },
+       { CAP1106_REG_INT_ENABLE,               0x3f },
+       { CAP1106_REG_REPEAT_RATE,              0x3f },
+       { CAP1106_REG_MT_CONFIG,                0x80 },
+       { CAP1106_REG_MT_PATTERN_CONFIG,        0x00 },
+       { CAP1106_REG_MT_PATTERN,               0x3f },
+       { CAP1106_REG_RECALIB_CONFIG,           0x8a },
+       { CAP1106_REG_SENSOR_THRESH(0),         0x40 },
+       { CAP1106_REG_SENSOR_THRESH(1),         0x40 },
+       { CAP1106_REG_SENSOR_THRESH(2),         0x40 },
+       { CAP1106_REG_SENSOR_THRESH(3),         0x40 },
+       { CAP1106_REG_SENSOR_THRESH(4),         0x40 },
+       { CAP1106_REG_SENSOR_THRESH(5),         0x40 },
+       { CAP1106_REG_SENSOR_NOISE_THRESH,      0x01 },
+       { CAP1106_REG_STANDBY_CHANNEL,          0x00 },
+       { CAP1106_REG_STANDBY_CONFIG,           0x39 },
+       { CAP1106_REG_STANDBY_SENSITIVITY,      0x02 },
+       { CAP1106_REG_STANDBY_THRESH,           0x40 },
+       { CAP1106_REG_CONFIG2,                  0x40 },
+       { CAP1106_REG_SENSOR_CALIB_LSB1,        0x00 },
+       { CAP1106_REG_SENSOR_CALIB_LSB2,        0x00 },
+};
+
+static bool cap1106_volatile_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case CAP1106_REG_MAIN_CONTROL:
+       case CAP1106_REG_SENSOR_INPUT:
+       case CAP1106_REG_SENOR_DELTA(0):
+       case CAP1106_REG_SENOR_DELTA(1):
+       case CAP1106_REG_SENOR_DELTA(2):
+       case CAP1106_REG_SENOR_DELTA(3):
+       case CAP1106_REG_SENOR_DELTA(4):
+       case CAP1106_REG_SENOR_DELTA(5):
+       case CAP1106_REG_PRODUCT_ID:
+       case CAP1106_REG_MANUFACTURER_ID:
+       case CAP1106_REG_REVISION:
+               return true;
+       }
+
+       return false;
+}
+
+static const struct regmap_config cap1106_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = CAP1106_REG_REVISION,
+       .reg_defaults = cap1106_reg_defaults,
+
+       .num_reg_defaults = ARRAY_SIZE(cap1106_reg_defaults),
+       .cache_type = REGCACHE_RBTREE,
+       .volatile_reg = cap1106_volatile_reg,
+};
+
+static irqreturn_t cap1106_thread_func(int irq_num, void *data)
+{
+       struct cap1106_priv *priv = data;
+       unsigned int status;
+       int ret, i;
+
+       /*
+        * Deassert interrupt. This needs to be done before reading the status
+        * registers, which will not carry valid values otherwise.
+        */
+       ret = regmap_update_bits(priv->regmap, CAP1106_REG_MAIN_CONTROL, 1, 0);
+       if (ret < 0)
+               goto out;
+
+       ret = regmap_read(priv->regmap, CAP1106_REG_SENSOR_INPUT, &status);
+       if (ret < 0)
+               goto out;
+
+       for (i = 0; i < CAP1106_NUM_CHN; i++)
+               input_report_key(priv->idev, priv->keycodes[i],
+                                status & (1 << i));
+
+       input_sync(priv->idev);
+
+out:
+       return IRQ_HANDLED;
+}
+
+static int cap1106_set_sleep(struct cap1106_priv *priv, bool sleep)
+{
+       return regmap_update_bits(priv->regmap, CAP1106_REG_MAIN_CONTROL,
+                                 CAP1106_REG_MAIN_CONTROL_DLSEEP,
+                                 sleep ? CAP1106_REG_MAIN_CONTROL_DLSEEP : 0);
+}
+
+static int cap1106_input_open(struct input_dev *idev)
+{
+       struct cap1106_priv *priv = input_get_drvdata(idev);
+
+       return cap1106_set_sleep(priv, false);
+}
+
+static void cap1106_input_close(struct input_dev *idev)
+{
+       struct cap1106_priv *priv = input_get_drvdata(idev);
+
+       cap1106_set_sleep(priv, true);
+}
+
+static int cap1106_i2c_probe(struct i2c_client *i2c_client,
+                            const struct i2c_device_id *id)
+{
+       struct device *dev = &i2c_client->dev;
+       struct cap1106_priv *priv;
+       struct device_node *node;
+       int i, error, irq, gain = 0;
+       unsigned int val, rev;
+       u32 gain32, keycodes[CAP1106_NUM_CHN];
+
+       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       priv->regmap = devm_regmap_init_i2c(i2c_client, &cap1106_regmap_config);
+       if (IS_ERR(priv->regmap))
+               return PTR_ERR(priv->regmap);
+
+       error = regmap_read(priv->regmap, CAP1106_REG_PRODUCT_ID, &val);
+       if (error)
+               return error;
+
+       if (val != CAP1106_PRODUCT_ID) {
+               dev_err(dev, "Product ID: Got 0x%02x, expected 0x%02x\n",
+                       val, CAP1106_PRODUCT_ID);
+               return -ENODEV;
+       }
+
+       error = regmap_read(priv->regmap, CAP1106_REG_MANUFACTURER_ID, &val);
+       if (error)
+               return error;
+
+       if (val != CAP1106_MANUFACTURER_ID) {
+               dev_err(dev, "Manufacturer ID: Got 0x%02x, expected 0x%02x\n",
+                       val, CAP1106_MANUFACTURER_ID);
+               return -ENODEV;
+       }
+
+       error = regmap_read(priv->regmap, CAP1106_REG_REVISION, &rev);
+       if (error < 0)
+               return error;
+
+       dev_info(dev, "CAP1106 detected, revision 0x%02x\n", rev);
+       i2c_set_clientdata(i2c_client, priv);
+       node = dev->of_node;
+
+       if (!of_property_read_u32(node, "microchip,sensor-gain", &gain32)) {
+               if (is_power_of_2(gain32) && gain32 <= 8)
+                       gain = ilog2(gain32);
+               else
+                       dev_err(dev, "Invalid sensor-gain value %d\n", gain32);
+       }
+
+       BUILD_BUG_ON(ARRAY_SIZE(keycodes) != ARRAY_SIZE(priv->keycodes));
+
+       /* Provide some useful defaults */
+       for (i = 0; i < ARRAY_SIZE(keycodes); i++)
+               keycodes[i] = KEY_A + i;
+
+       of_property_read_u32_array(node, "linux,keycodes",
+                                  keycodes, ARRAY_SIZE(keycodes));
+
+       for (i = 0; i < ARRAY_SIZE(keycodes); i++)
+               priv->keycodes[i] = keycodes[i];
+
+       error = regmap_update_bits(priv->regmap, CAP1106_REG_MAIN_CONTROL,
+                                  CAP1106_REG_MAIN_CONTROL_GAIN_MASK,
+                                  gain << CAP1106_REG_MAIN_CONTROL_GAIN_SHIFT);
+       if (error)
+               return error;
+
+       /* Disable autorepeat. The Linux input system has its own handling. */
+       error = regmap_write(priv->regmap, CAP1106_REG_REPEAT_RATE, 0);
+       if (error)
+               return error;
+
+       priv->idev = devm_input_allocate_device(dev);
+       if (!priv->idev)
+               return -ENOMEM;
+
+       priv->idev->name = "CAP1106 capacitive touch sensor";
+       priv->idev->id.bustype = BUS_I2C;
+       priv->idev->evbit[0] = BIT_MASK(EV_KEY);
+
+       if (of_property_read_bool(node, "autorepeat"))
+               __set_bit(EV_REP, priv->idev->evbit);
+
+       for (i = 0; i < CAP1106_NUM_CHN; i++)
+               __set_bit(priv->keycodes[i], priv->idev->keybit);
+
+       priv->idev->id.vendor = CAP1106_MANUFACTURER_ID;
+       priv->idev->id.product = CAP1106_PRODUCT_ID;
+       priv->idev->id.version = rev;
+
+       priv->idev->open = cap1106_input_open;
+       priv->idev->close = cap1106_input_close;
+
+       input_set_drvdata(priv->idev, priv);
+
+       /*
+        * Put the device in deep sleep mode for now.
+        * ->open() will bring it back once the it is actually needed.
+        */
+       cap1106_set_sleep(priv, true);
+
+       error = input_register_device(priv->idev);
+       if (error)
+               return error;
+
+       irq = irq_of_parse_and_map(node, 0);
+       if (!irq) {
+               dev_err(dev, "Unable to parse or map IRQ\n");
+               return -ENXIO;
+       }
+
+       error = devm_request_threaded_irq(dev, irq, NULL, cap1106_thread_func,
+                                         IRQF_ONESHOT, dev_name(dev), priv);
+       if (error)
+               return error;
+
+       return 0;
+}
+
+static const struct of_device_id cap1106_dt_ids[] = {
+       { .compatible = "microchip,cap1106", },
+       {}
+};
+MODULE_DEVICE_TABLE(of, cap1106_dt_ids);
+
+static const struct i2c_device_id cap1106_i2c_ids[] = {
+       { "cap1106", 0 },
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, cap1106_i2c_ids);
+
+static struct i2c_driver cap1106_i2c_driver = {
+       .driver = {
+               .name   = "cap1106",
+               .owner  = THIS_MODULE,
+               .of_match_table = cap1106_dt_ids,
+       },
+       .id_table       = cap1106_i2c_ids,
+       .probe          = cap1106_i2c_probe,
+};
+
+module_i2c_driver(cap1106_i2c_driver);
+
+MODULE_ALIAS("platform:cap1106");
+MODULE_DESCRIPTION("Microchip CAP1106 driver");
+MODULE_AUTHOR("Daniel Mack <linux@zonque.org>");
+MODULE_LICENSE("GPL v2");
index 430b545..faa6da5 100644 (file)
@@ -203,12 +203,17 @@ static int max7359_probe(struct i2c_client *client,
 
        dev_dbg(&client->dev, "keys FIFO is 0x%02x\n", ret);
 
-       keypad = kzalloc(sizeof(struct max7359_keypad), GFP_KERNEL);
-       input_dev = input_allocate_device();
-       if (!keypad || !input_dev) {
+       keypad = devm_kzalloc(&client->dev, sizeof(struct max7359_keypad),
+                             GFP_KERNEL);
+       if (!keypad) {
                dev_err(&client->dev, "failed to allocate memory\n");
-               error = -ENOMEM;
-               goto failed_free_mem;
+               return -ENOMEM;
+       }
+
+       input_dev = devm_input_allocate_device(&client->dev);
+       if (!input_dev) {
+               dev_err(&client->dev, "failed to allocate input device\n");
+               return -ENOMEM;
        }
 
        keypad->client = client;
@@ -230,19 +235,20 @@ static int max7359_probe(struct i2c_client *client,
 
        max7359_build_keycode(keypad, keymap_data);
 
-       error = request_threaded_irq(client->irq, NULL, max7359_interrupt,
-                                    IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-                                    client->name, keypad);
+       error = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+                                         max7359_interrupt,
+                                         IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                         client->name, keypad);
        if (error) {
                dev_err(&client->dev, "failed to register interrupt\n");
-               goto failed_free_mem;
+               return error;
        }
 
        /* Register the input device */
        error = input_register_device(input_dev);
        if (error) {
                dev_err(&client->dev, "failed to register input device\n");
-               goto failed_free_irq;
+               return error;
        }
 
        /* Initialize MAX7359 */
@@ -252,24 +258,6 @@ static int max7359_probe(struct i2c_client *client,
        device_init_wakeup(&client->dev, 1);
 
        return 0;
-
-failed_free_irq:
-       free_irq(client->irq, keypad);
-failed_free_mem:
-       input_free_device(input_dev);
-       kfree(keypad);
-       return error;
-}
-
-static int max7359_remove(struct i2c_client *client)
-{
-       struct max7359_keypad *keypad = i2c_get_clientdata(client);
-
-       free_irq(client->irq, keypad);
-       input_unregister_device(keypad->input_dev);
-       kfree(keypad);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -313,7 +301,6 @@ static struct i2c_driver max7359_i2c_driver = {
                .pm   = &max7359_pm,
        },
        .probe          = max7359_probe,
-       .remove         = max7359_remove,
        .id_table       = max7359_ids,
 };
 
index 01f3b5b..a3fe4a9 100644 (file)
@@ -392,7 +392,6 @@ static void keyspan_irq_recv(struct urb *urb)
 
        default:
                goto resubmit;
-               break;
        }
 
        if (debug)
index 8569362..421e29e 100644 (file)
@@ -311,7 +311,14 @@ static int uinput_open(struct inode *inode, struct file *file)
 static int uinput_validate_absbits(struct input_dev *dev)
 {
        unsigned int cnt;
-       int retval = 0;
+       int nslot;
+
+       if (!test_bit(EV_ABS, dev->evbit))
+               return 0;
+
+       /*
+        * Check if absmin/absmax/absfuzz/absflat are sane.
+        */
 
        for (cnt = 0; cnt < ABS_CNT; cnt++) {
                int min, max;
@@ -327,8 +334,7 @@ static int uinput_validate_absbits(struct input_dev *dev)
                                UINPUT_NAME, cnt,
                                input_abs_get_min(dev, cnt),
                                input_abs_get_max(dev, cnt));
-                       retval = -EINVAL;
-                       break;
+                       return -EINVAL;
                }
 
                if (input_abs_get_flat(dev, cnt) >
@@ -340,11 +346,18 @@ static int uinput_validate_absbits(struct input_dev *dev)
                                input_abs_get_flat(dev, cnt),
                                input_abs_get_min(dev, cnt),
                                input_abs_get_max(dev, cnt));
-                       retval = -EINVAL;
-                       break;
+                       return -EINVAL;
                }
        }
-       return retval;
+
+       if (test_bit(ABS_MT_SLOT, dev->absbit)) {
+               nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
+               input_mt_init_slots(dev, nslot, 0);
+       } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
+               input_set_events_per_packet(dev, 60);
+       }
+
+       return 0;
 }
 
 static int uinput_allocate_device(struct uinput_device *udev)
@@ -410,19 +423,9 @@ static int uinput_setup_device(struct uinput_device *udev,
                input_abs_set_flat(dev, i, user_dev->absflat[i]);
        }
 
-       /* check if absmin/absmax/absfuzz/absflat are filled as
-        * told in Documentation/input/input-programming.txt */
-       if (test_bit(EV_ABS, dev->evbit)) {
-               retval = uinput_validate_absbits(dev);
-               if (retval < 0)
-                       goto exit;
-               if (test_bit(ABS_MT_SLOT, dev->absbit)) {
-                       int nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
-                       input_mt_init_slots(dev, nslot, 0);
-               } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
-                       input_set_events_per_packet(dev, 60);
-               }
-       }
+       retval = uinput_validate_absbits(dev);
+       if (retval < 0)
+               goto exit;
 
        udev->state = UIST_SETUP_COMPLETE;
        retval = count;
@@ -720,6 +723,12 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
        }
 
        switch (cmd) {
+               case UI_GET_VERSION:
+                       if (put_user(UINPUT_VERSION,
+                                    (unsigned int __user *)p))
+                               retval = -EFAULT;
+                       goto out;
+
                case UI_DEV_CREATE:
                        retval = uinput_create_device(udev);
                        goto out;
index bed7cbf..a5121b0 100644 (file)
@@ -89,4 +89,14 @@ config TABLET_USB_WACOM
          To compile this driver as a module, choose M here: the
          module will be called wacom.
 
+config TABLET_SERIAL_WACOM4
+       tristate "Wacom protocol 4 serial tablet support"
+       select SERIO
+       help
+         Say Y here if you want to use Wacom protocol 4 serial tablets.
+         E.g. serial versions of the Cintiq, Graphire or Penpartner.
+
+         To compile this driver as a module, choose M here: the
+         module will be called wacom_serial4.
+
 endif
index 3f6c252..4d9339f 100644 (file)
@@ -11,3 +11,4 @@ obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o
 obj-$(CONFIG_TABLET_USB_HANWANG) += hanwang.o
 obj-$(CONFIG_TABLET_USB_KBTAB) += kbtab.o
 obj-$(CONFIG_TABLET_USB_WACOM) += wacom.o
+obj-$(CONFIG_TABLET_SERIAL_WACOM4) += wacom_serial4.o
diff --git a/drivers/input/tablet/wacom_serial4.c b/drivers/input/tablet/wacom_serial4.c
new file mode 100644 (file)
index 0000000..d3d251e
--- /dev/null
@@ -0,0 +1,616 @@
+/*
+ * Wacom protocol 4 serial tablet driver
+ *
+ * Copyright 2014      Hans de Goede <hdegoede@redhat.com>
+ * Copyright 2011-2012 Julian Squires <julian@cipht.net>
+ *
+ * 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 of 2 of the License, or (at your
+ * option) any later version. See the file COPYING in the main directory of
+ * this archive for more details.
+ *
+ * Many thanks to Bill Seremetis, without whom PenPartner support
+ * would not have been possible. Thanks to Patrick Mahoney.
+ *
+ * This driver was developed with reference to much code written by others,
+ * particularly:
+ *  - elo, gunze drivers by Vojtech Pavlik <vojtech@ucw.cz>;
+ *  - wacom_w8001 driver by Jaya Kumar <jayakumar.lkml@gmail.com>;
+ *  - the USB wacom input driver, credited to many people
+ *    (see drivers/input/tablet/wacom.h);
+ *  - new and old versions of linuxwacom / xf86-input-wacom credited to
+ *    Frederic Lepied, France. <Lepied@XFree86.org> and
+ *    Ping Cheng, Wacom. <pingc@wacom.com>;
+ *  - and xf86wacom.c (a presumably ancient version of the linuxwacom code),
+ *    by Frederic Lepied and Raph Levien <raph@gtk.org>.
+ *
+ * To do:
+ *  - support pad buttons; (requires access to a model with pad buttons)
+ *  - support (protocol 4-style) tilt (requires access to a > 1.4 rom model)
+ */
+
+/*
+ * Wacom serial protocol 4 documentation taken from linuxwacom-0.9.9 code,
+ * protocol 4 uses 7 or 9 byte of data in the following format:
+ *
+ *     Byte 1
+ *     bit 7  Sync bit always 1
+ *     bit 6  Pointing device detected
+ *     bit 5  Cursor = 0 / Stylus = 1
+ *     bit 4  Reserved
+ *     bit 3  1 if a button on the pointing device has been pressed
+ *     bit 2  P0 (optional)
+ *     bit 1  X15
+ *     bit 0  X14
+ *
+ *     Byte 2
+ *     bit 7  Always 0
+ *     bits 6-0 = X13 - X7
+ *
+ *     Byte 3
+ *     bit 7  Always 0
+ *     bits 6-0 = X6 - X0
+ *
+ *     Byte 4
+ *     bit 7  Always 0
+ *     bit 6  B3
+ *     bit 5  B2
+ *     bit 4  B1
+ *     bit 3  B0
+ *     bit 2  P1 (optional)
+ *     bit 1  Y15
+ *     bit 0  Y14
+ *
+ *     Byte 5
+ *     bit 7  Always 0
+ *     bits 6-0 = Y13 - Y7
+ *
+ *     Byte 6
+ *     bit 7  Always 0
+ *     bits 6-0 = Y6 - Y0
+ *
+ *     Byte 7
+ *     bit 7 Always 0
+ *     bit 6  Sign of pressure data; or wheel-rel for cursor tool
+ *     bit 5  P7; or REL1 for cursor tool
+ *     bit 4  P6; or REL0 for cursor tool
+ *     bit 3  P5
+ *     bit 2  P4
+ *     bit 1  P3
+ *     bit 0  P2
+ *
+ *     byte 8 and 9 are optional and present only
+ *     in tilt mode.
+ *
+ *     Byte 8
+ *     bit 7 Always 0
+ *     bit 6 Sign of tilt X
+ *     bit 5  Xt6
+ *     bit 4  Xt5
+ *     bit 3  Xt4
+ *     bit 2  Xt3
+ *     bit 1  Xt2
+ *     bit 0  Xt1
+ *
+ *     Byte 9
+ *     bit 7 Always 0
+ *     bit 6 Sign of tilt Y
+ *     bit 5  Yt6
+ *     bit 4  Yt5
+ *     bit 3  Yt4
+ *     bit 2  Yt3
+ *     bit 1  Yt2
+ *     bit 0  Yt1
+ */
+
+#include <linux/completion.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/serio.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include "wacom_wac.h"
+
+MODULE_AUTHOR("Julian Squires <julian@cipht.net>, Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("Wacom protocol 4 serial tablet driver");
+MODULE_LICENSE("GPL");
+
+#define REQUEST_MODEL_AND_ROM_VERSION  "~#"
+#define REQUEST_MAX_COORDINATES                "~C\r"
+#define REQUEST_CONFIGURATION_STRING   "~R\r"
+#define REQUEST_RESET_TO_PROTOCOL_IV   "\r#"
+/*
+ * Note: sending "\r$\r" causes at least the Digitizer II to send
+ * packets in ASCII instead of binary.  "\r#" seems to undo that.
+ */
+
+#define COMMAND_START_SENDING_PACKETS          "ST\r"
+#define COMMAND_STOP_SENDING_PACKETS           "SP\r"
+#define COMMAND_MULTI_MODE_INPUT               "MU1\r"
+#define COMMAND_ORIGIN_IN_UPPER_LEFT           "OC1\r"
+#define COMMAND_ENABLE_ALL_MACRO_BUTTONS       "~M0\r"
+#define COMMAND_DISABLE_GROUP_1_MACRO_BUTTONS  "~M1\r"
+#define COMMAND_TRANSMIT_AT_MAX_RATE           "IT0\r"
+#define COMMAND_DISABLE_INCREMENTAL_MODE       "IN0\r"
+#define COMMAND_ENABLE_CONTINUOUS_MODE         "SR\r"
+#define COMMAND_ENABLE_PRESSURE_MODE           "PH1\r"
+#define COMMAND_Z_FILTER                       "ZF1\r"
+
+/* Note that this is a protocol 4 packet without tilt information. */
+#define PACKET_LENGTH          7
+#define DATA_SIZE              32
+
+/* flags */
+#define F_COVERS_SCREEN                0x01
+#define F_HAS_STYLUS2          0x02
+#define F_HAS_SCROLLWHEEL      0x04
+
+enum { STYLUS = 1, ERASER, CURSOR };
+
+static const struct {
+       int device_id;
+       int input_id;
+} tools[] = {
+       { 0, 0 },
+       { STYLUS_DEVICE_ID, BTN_TOOL_PEN },
+       { ERASER_DEVICE_ID, BTN_TOOL_RUBBER },
+       { CURSOR_DEVICE_ID, BTN_TOOL_MOUSE },
+};
+
+struct wacom {
+       struct input_dev *dev;
+       struct completion cmd_done;
+       int result;
+       u8 expect;
+       u8 eraser_mask;
+       unsigned int extra_z_bits;
+       unsigned int flags;
+       unsigned int res_x, res_y;
+       unsigned int max_x, max_y;
+       unsigned int tool;
+       unsigned int idx;
+       u8 data[DATA_SIZE];
+       char phys[32];
+};
+
+enum {
+       MODEL_CINTIQ            = 0x504C, /* PL */
+       MODEL_CINTIQ2           = 0x4454, /* DT */
+       MODEL_DIGITIZER_II      = 0x5544, /* UD */
+       MODEL_GRAPHIRE          = 0x4554, /* ET */
+       MODEL_PENPARTNER        = 0x4354, /* CT */
+};
+
+static void wacom_handle_model_response(struct wacom *wacom)
+{
+       int major_v, minor_v, r = 0;
+       char *p;
+
+       p = strrchr(wacom->data, 'V');
+       if (p)
+               r = sscanf(p + 1, "%u.%u", &major_v, &minor_v);
+       if (r != 2)
+               major_v = minor_v = 0;
+
+       switch (wacom->data[2] << 8 | wacom->data[3]) {
+       case MODEL_CINTIQ:      /* UNTESTED */
+       case MODEL_CINTIQ2:
+               if ((wacom->data[2] << 8 | wacom->data[3]) == MODEL_CINTIQ) {
+                       wacom->dev->name = "Wacom Cintiq";
+                       wacom->dev->id.version = MODEL_CINTIQ;
+               } else {
+                       wacom->dev->name = "Wacom Cintiq II";
+                       wacom->dev->id.version = MODEL_CINTIQ2;
+               }
+               wacom->res_x = 508;
+               wacom->res_y = 508;
+
+               switch (wacom->data[5] << 8 | wacom->data[6]) {
+               case 0x3731: /* PL-710 */
+                       wacom->res_x = 2540;
+                       wacom->res_y = 2540;
+                       /* fall through */
+               case 0x3535: /* PL-550 */
+               case 0x3830: /* PL-800 */
+                       wacom->extra_z_bits = 2;
+               }
+
+               wacom->flags = F_COVERS_SCREEN;
+               break;
+
+       case MODEL_PENPARTNER:
+               wacom->dev->name = "Wacom Penpartner";
+               wacom->dev->id.version = MODEL_PENPARTNER;
+               wacom->res_x = 1000;
+               wacom->res_y = 1000;
+               break;
+
+       case MODEL_GRAPHIRE:
+               wacom->dev->name = "Wacom Graphire";
+               wacom->dev->id.version = MODEL_GRAPHIRE;
+               wacom->res_x = 1016;
+               wacom->res_y = 1016;
+               wacom->max_x = 5103;
+               wacom->max_y = 3711;
+               wacom->extra_z_bits = 2;
+               wacom->eraser_mask = 0x08;
+               wacom->flags = F_HAS_STYLUS2 | F_HAS_SCROLLWHEEL;
+               break;
+
+       case MODEL_DIGITIZER_II:
+               wacom->dev->name = "Wacom Digitizer II";
+               wacom->dev->id.version = MODEL_DIGITIZER_II;
+               if (major_v == 1 && minor_v <= 2)
+                       wacom->extra_z_bits = 0; /* UNTESTED */
+               break;
+
+       default:
+               dev_err(&wacom->dev->dev, "Unsupported Wacom model %s\n",
+                       wacom->data);
+               wacom->result = -ENODEV;
+               return;
+       }
+
+       dev_info(&wacom->dev->dev, "%s tablet, version %u.%u\n",
+                wacom->dev->name, major_v, minor_v);
+}
+
+static void wacom_handle_configuration_response(struct wacom *wacom)
+{
+       int r, skip;
+
+       dev_dbg(&wacom->dev->dev, "Configuration string: %s\n", wacom->data);
+       r = sscanf(wacom->data, "~R%x,%u,%u,%u,%u", &skip, &skip, &skip,
+                  &wacom->res_x, &wacom->res_y);
+       if (r != 5)
+               dev_warn(&wacom->dev->dev, "could not get resolution\n");
+}
+
+static void wacom_handle_coordinates_response(struct wacom *wacom)
+{
+       int r;
+
+       dev_dbg(&wacom->dev->dev, "Coordinates string: %s\n", wacom->data);
+       r = sscanf(wacom->data, "~C%u,%u", &wacom->max_x, &wacom->max_y);
+       if (r != 2)
+               dev_warn(&wacom->dev->dev, "could not get max coordinates\n");
+}
+
+static void wacom_handle_response(struct wacom *wacom)
+{
+       if (wacom->data[0] != '~' || wacom->data[1] != wacom->expect) {
+               dev_err(&wacom->dev->dev,
+                       "Wacom got an unexpected response: %s\n", wacom->data);
+               wacom->result = -EIO;
+       } else {
+               wacom->result = 0;
+
+               switch (wacom->data[1]) {
+               case '#':
+                       wacom_handle_model_response(wacom);
+                       break;
+               case 'R':
+                       wacom_handle_configuration_response(wacom);
+                       break;
+               case 'C':
+                       wacom_handle_coordinates_response(wacom);
+                       break;
+               }
+       }
+
+       complete(&wacom->cmd_done);
+}
+
+static void wacom_handle_packet(struct wacom *wacom)
+{
+       u8 in_proximity_p, stylus_p, button;
+       unsigned int tool;
+       int x, y, z;
+
+       in_proximity_p = wacom->data[0] & 0x40;
+       stylus_p = wacom->data[0] & 0x20;
+       button = (wacom->data[3] & 0x78) >> 3;
+       x = (wacom->data[0] & 3) << 14 | wacom->data[1]<<7 | wacom->data[2];
+       y = (wacom->data[3] & 3) << 14 | wacom->data[4]<<7 | wacom->data[5];
+
+       if (in_proximity_p && stylus_p) {
+               z = wacom->data[6] & 0x7f;
+               if (wacom->extra_z_bits >= 1)
+                       z = z << 1 | (wacom->data[3] & 0x4) >> 2;
+               if (wacom->extra_z_bits > 1)
+                       z = z << 1 | (wacom->data[0] & 0x4) >> 2;
+               z = z ^ (0x40 << wacom->extra_z_bits);
+       } else {
+               z = -1;
+       }
+
+       if (stylus_p)
+               tool = (button & wacom->eraser_mask) ? ERASER : STYLUS;
+       else
+               tool = CURSOR;
+
+       if (tool != wacom->tool && wacom->tool != 0) {
+               input_report_key(wacom->dev, tools[wacom->tool].input_id, 0);
+               input_sync(wacom->dev);
+       }
+       wacom->tool = tool;
+
+       input_report_key(wacom->dev, tools[tool].input_id, in_proximity_p);
+       input_report_abs(wacom->dev, ABS_MISC,
+                        in_proximity_p ? tools[tool].device_id : 0);
+       input_report_abs(wacom->dev, ABS_X, x);
+       input_report_abs(wacom->dev, ABS_Y, y);
+       input_report_abs(wacom->dev, ABS_PRESSURE, z);
+       if (stylus_p) {
+               input_report_key(wacom->dev, BTN_TOUCH, button & 1);
+               input_report_key(wacom->dev, BTN_STYLUS, button & 2);
+               input_report_key(wacom->dev, BTN_STYLUS2, button & 4);
+       } else {
+               input_report_key(wacom->dev, BTN_LEFT, button & 1);
+               input_report_key(wacom->dev, BTN_RIGHT, button & 2);
+               input_report_key(wacom->dev, BTN_MIDDLE, button & 4);
+               /* handle relative wheel for non-stylus device */
+               z = (wacom->data[6] & 0x30) >> 4;
+               if (wacom->data[6] & 0x40)
+                       z = -z;
+               input_report_rel(wacom->dev, REL_WHEEL, z);
+       }
+       input_sync(wacom->dev);
+}
+
+static void wacom_clear_data_buf(struct wacom *wacom)
+{
+       memset(wacom->data, 0, DATA_SIZE);
+       wacom->idx = 0;
+}
+
+static irqreturn_t wacom_interrupt(struct serio *serio, unsigned char data,
+                                  unsigned int flags)
+{
+       struct wacom *wacom = serio_get_drvdata(serio);
+
+       if (data & 0x80)
+               wacom->idx = 0;
+
+       /*
+        * We're either expecting a carriage return-terminated ASCII
+        * response string, or a seven-byte packet with the MSB set on
+        * the first byte.
+        *
+        * Note however that some tablets (the PenPartner, for
+        * example) don't send a carriage return at the end of a
+        * command.  We handle these by waiting for timeout.
+        */
+       if (data == '\r' && !(wacom->data[0] & 0x80)) {
+               wacom_handle_response(wacom);
+               wacom_clear_data_buf(wacom);
+               return IRQ_HANDLED;
+       }
+
+       /* Leave place for 0 termination */
+       if (wacom->idx > (DATA_SIZE - 2)) {
+               dev_dbg(&wacom->dev->dev,
+                       "throwing away %d bytes of garbage\n", wacom->idx);
+               wacom_clear_data_buf(wacom);
+       }
+       wacom->data[wacom->idx++] = data;
+
+       if (wacom->idx == PACKET_LENGTH && (wacom->data[0] & 0x80)) {
+               wacom_handle_packet(wacom);
+               wacom_clear_data_buf(wacom);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static void wacom_disconnect(struct serio *serio)
+{
+       struct wacom *wacom = serio_get_drvdata(serio);
+
+       serio_close(serio);
+       serio_set_drvdata(serio, NULL);
+       input_unregister_device(wacom->dev);
+       kfree(wacom);
+}
+
+static int wacom_send(struct serio *serio, const u8 *command)
+{
+       int err = 0;
+
+       for (; !err && *command; command++)
+               err = serio_write(serio, *command);
+
+       return err;
+}
+
+static int wacom_send_setup_string(struct wacom *wacom, struct serio *serio)
+{
+       const u8 *cmd;
+
+       switch (wacom->dev->id.version) {
+       case MODEL_CINTIQ:      /* UNTESTED */
+               cmd = COMMAND_ORIGIN_IN_UPPER_LEFT
+                       COMMAND_TRANSMIT_AT_MAX_RATE
+                       COMMAND_ENABLE_CONTINUOUS_MODE
+                       COMMAND_START_SENDING_PACKETS;
+               break;
+
+       case MODEL_PENPARTNER:
+               cmd = COMMAND_ENABLE_PRESSURE_MODE
+                       COMMAND_START_SENDING_PACKETS;
+               break;
+
+       default:
+               cmd = COMMAND_MULTI_MODE_INPUT
+                       COMMAND_ORIGIN_IN_UPPER_LEFT
+                       COMMAND_ENABLE_ALL_MACRO_BUTTONS
+                       COMMAND_DISABLE_GROUP_1_MACRO_BUTTONS
+                       COMMAND_TRANSMIT_AT_MAX_RATE
+                       COMMAND_DISABLE_INCREMENTAL_MODE
+                       COMMAND_ENABLE_CONTINUOUS_MODE
+                       COMMAND_Z_FILTER
+                       COMMAND_START_SENDING_PACKETS;
+               break;
+       }
+
+       return wacom_send(serio, cmd);
+}
+
+static int wacom_send_and_wait(struct wacom *wacom, struct serio *serio,
+                              const u8 *cmd, const char *desc)
+{
+       int err;
+       unsigned long u;
+
+       wacom->expect = cmd[1];
+       init_completion(&wacom->cmd_done);
+
+       err = wacom_send(serio, cmd);
+       if (err)
+               return err;
+
+       u = wait_for_completion_timeout(&wacom->cmd_done, HZ);
+       if (u == 0) {
+               /* Timeout, process what we've received. */
+               wacom_handle_response(wacom);
+       }
+
+       wacom->expect = 0;
+       return wacom->result;
+}
+
+static int wacom_setup(struct wacom *wacom, struct serio *serio)
+{
+       int err;
+
+       /* Note that setting the link speed is the job of inputattach.
+        * We assume that reset negotiation has already happened,
+        * here. */
+       err = wacom_send_and_wait(wacom, serio, REQUEST_MODEL_AND_ROM_VERSION,
+                                 "model and version");
+       if (err)
+               return err;
+
+       if (!(wacom->res_x && wacom->res_y)) {
+               err = wacom_send_and_wait(wacom, serio,
+                                         REQUEST_CONFIGURATION_STRING,
+                                         "configuration string");
+               if (err)
+                       return err;
+       }
+
+       if (!(wacom->max_x && wacom->max_y)) {
+               err = wacom_send_and_wait(wacom, serio,
+                                         REQUEST_MAX_COORDINATES,
+                                         "coordinates string");
+               if (err)
+                       return err;
+       }
+
+       return wacom_send_setup_string(wacom, serio);
+}
+
+static int wacom_connect(struct serio *serio, struct serio_driver *drv)
+{
+       struct wacom *wacom;
+       struct input_dev *input_dev;
+       int err = -ENOMEM;
+
+       wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
+       input_dev = input_allocate_device();
+       if (!wacom || !input_dev)
+               goto free_device;
+
+       wacom->dev = input_dev;
+       wacom->extra_z_bits = 1;
+       wacom->eraser_mask = 0x04;
+       wacom->tool = wacom->idx = 0;
+       snprintf(wacom->phys, sizeof(wacom->phys), "%s/input0", serio->phys);
+       input_dev->phys = wacom->phys;
+       input_dev->id.bustype = BUS_RS232;
+       input_dev->id.vendor  = SERIO_WACOM_IV;
+       input_dev->id.product = serio->id.extra;
+       input_dev->dev.parent = &serio->dev;
+
+       input_dev->evbit[0] =
+               BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) | BIT_MASK(EV_REL);
+       set_bit(ABS_MISC, input_dev->absbit);
+       set_bit(BTN_TOOL_PEN, input_dev->keybit);
+       set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+       set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
+       set_bit(BTN_TOUCH, input_dev->keybit);
+       set_bit(BTN_STYLUS, input_dev->keybit);
+       set_bit(BTN_LEFT, input_dev->keybit);
+       set_bit(BTN_RIGHT, input_dev->keybit);
+       set_bit(BTN_MIDDLE, input_dev->keybit);
+
+       serio_set_drvdata(serio, wacom);
+
+       err = serio_open(serio, drv);
+       if (err)
+               goto free_device;
+
+       err = wacom_setup(wacom, serio);
+       if (err)
+               goto close_serio;
+
+       set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
+       if (!(wacom->flags & F_COVERS_SCREEN))
+               __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
+
+       if (wacom->flags & F_HAS_STYLUS2)
+               __set_bit(BTN_STYLUS2, input_dev->keybit);
+
+       if (wacom->flags & F_HAS_SCROLLWHEEL)
+               __set_bit(REL_WHEEL, input_dev->relbit);
+
+       input_abs_set_res(wacom->dev, ABS_X, wacom->res_x);
+       input_abs_set_res(wacom->dev, ABS_Y, wacom->res_y);
+       input_set_abs_params(wacom->dev, ABS_X, 0, wacom->max_x, 0, 0);
+       input_set_abs_params(wacom->dev, ABS_Y, 0, wacom->max_y, 0, 0);
+       input_set_abs_params(wacom->dev, ABS_PRESSURE, -1,
+                            (1 << (7 + wacom->extra_z_bits)) - 1, 0, 0);
+
+       err = input_register_device(wacom->dev);
+       if (err)
+               goto close_serio;
+
+       return 0;
+
+close_serio:
+       serio_close(serio);
+free_device:
+       serio_set_drvdata(serio, NULL);
+       input_free_device(input_dev);
+       kfree(wacom);
+       return err;
+}
+
+static struct serio_device_id wacom_serio_ids[] = {
+       {
+               .type   = SERIO_RS232,
+               .proto  = SERIO_WACOM_IV,
+               .id     = SERIO_ANY,
+               .extra  = SERIO_ANY,
+       },
+       { 0 }
+};
+
+MODULE_DEVICE_TABLE(serio, wacom_serio_ids);
+
+static struct serio_driver wacom_drv = {
+       .driver         = {
+               .name   = "wacom_serial4",
+       },
+       .description    = "Wacom protocol 4 serial tablet driver",
+       .id_table       = wacom_serio_ids,
+       .interrupt      = wacom_interrupt,
+       .connect        = wacom_connect,
+       .disconnect     = wacom_disconnect,
+};
+
+module_serio_driver(wacom_drv);
index 6e0b4a2..c6dfd0a 100644 (file)
@@ -2,6 +2,7 @@
  * Atmel maXTouch Touchscreen driver
  *
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Copyright (C) 2011-2014 Atmel Corporation
  * Copyright (C) 2012 Google, Inc.
  *
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
@@ -22,6 +23,7 @@
 #include <linux/i2c/atmel_mxt_ts.h>
 #include <linux/input/mt.h>
 #include <linux/interrupt.h>
+#include <linux/of.h>
 #include <linux/slab.h>
 
 /* Version */
 #define MXT_VER_21             21
 #define MXT_VER_22             22
 
-/* Firmware */
+/* Firmware files */
 #define MXT_FW_NAME            "maxtouch.fw"
+#define MXT_CFG_NAME           "maxtouch.cfg"
+#define MXT_CFG_MAGIC          "OBP_RAW V1"
 
 /* Registers */
 #define MXT_INFO               0x00
@@ -44,6 +48,8 @@
 #define MXT_OBJECT_START       0x07
 
 #define MXT_OBJECT_SIZE                6
+#define MXT_INFO_CHECKSUM_SIZE 3
+#define MXT_MAX_BLOCK_WRITE    256
 
 /* Object types */
 #define MXT_DEBUG_DIAGNOSTIC_T37       37
@@ -74,6 +80,9 @@
 #define MXT_SPT_MESSAGECOUNT_T44       44
 #define MXT_SPT_CTECONFIG_T46          46
 
+/* MXT_GEN_MESSAGE_T5 object */
+#define MXT_RPTID_NOMSG                0xff
+
 /* MXT_GEN_COMMAND_T6 field */
 #define MXT_COMMAND_RESET      0
 #define MXT_COMMAND_BACKUPNV   1
 
 /* Define for T6 status byte */
 #define MXT_T6_STATUS_RESET    (1 << 7)
+#define MXT_T6_STATUS_OFL      (1 << 6)
+#define MXT_T6_STATUS_SIGERR   (1 << 5)
+#define MXT_T6_STATUS_CAL      (1 << 4)
+#define MXT_T6_STATUS_CFGERR   (1 << 3)
+#define MXT_T6_STATUS_COMSERR  (1 << 2)
 
 /* MXT_GEN_POWER_T7 field */
 #define MXT_POWER_IDLEACQINT   0
@@ -217,11 +231,6 @@ struct mxt_object {
        u8 num_report_ids;
 } __packed;
 
-struct mxt_message {
-       u8 reportid;
-       u8 message[7];
-};
-
 /* Each client has this additional data */
 struct mxt_data {
        struct i2c_client *client;
@@ -234,15 +243,27 @@ struct mxt_data {
        unsigned int max_x;
        unsigned int max_y;
        bool in_bootloader;
+       u16 mem_size;
+       u8 max_reportid;
        u32 config_crc;
+       u32 info_crc;
        u8 bootloader_addr;
+       u8 *msg_buf;
+       u8 t6_status;
+       bool update_input;
+       u8 last_message_count;
+       u8 num_touchids;
 
        /* Cached parameters from object table */
+       u16 T5_address;
+       u8 T5_msg_size;
        u8 T6_reportid;
        u16 T6_address;
+       u16 T7_address;
        u8 T9_reportid_min;
        u8 T9_reportid_max;
        u8 T19_reportid;
+       u16 T44_address;
 
        /* for fw update in bootloader */
        struct completion bl_completion;
@@ -297,42 +318,10 @@ static bool mxt_object_readable(unsigned int type)
        }
 }
 
-static bool mxt_object_writable(unsigned int type)
-{
-       switch (type) {
-       case MXT_GEN_COMMAND_T6:
-       case MXT_GEN_POWER_T7:
-       case MXT_GEN_ACQUIRE_T8:
-       case MXT_TOUCH_MULTI_T9:
-       case MXT_TOUCH_KEYARRAY_T15:
-       case MXT_TOUCH_PROXIMITY_T23:
-       case MXT_TOUCH_PROXKEY_T52:
-       case MXT_PROCI_GRIPFACE_T20:
-       case MXT_PROCG_NOISE_T22:
-       case MXT_PROCI_ONETOUCH_T24:
-       case MXT_PROCI_TWOTOUCH_T27:
-       case MXT_PROCI_GRIP_T40:
-       case MXT_PROCI_PALM_T41:
-       case MXT_PROCI_TOUCHSUPPRESSION_T42:
-       case MXT_PROCI_STYLUS_T47:
-       case MXT_PROCG_NOISESUPPRESSION_T48:
-       case MXT_SPT_COMMSCONFIG_T18:
-       case MXT_SPT_GPIOPWM_T19:
-       case MXT_SPT_SELFTEST_T25:
-       case MXT_SPT_CTECONFIG_T28:
-       case MXT_SPT_DIGITIZER_T43:
-       case MXT_SPT_CTECONFIG_T46:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static void mxt_dump_message(struct device *dev,
-                            struct mxt_message *message)
+static void mxt_dump_message(struct mxt_data *data, u8 *message)
 {
-       dev_dbg(dev, "reportid: %u\tmessage: %*ph\n",
-               message->reportid, 7, message->message);
+       dev_dbg(&data->client->dev, "message: %*ph\n",
+               data->T5_msg_size, message);
 }
 
 static int mxt_wait_for_completion(struct mxt_data *data,
@@ -401,7 +390,7 @@ static int mxt_bootloader_write(struct mxt_data *data,
        return ret;
 }
 
-static int mxt_lookup_bootloader_address(struct mxt_data *data)
+static int mxt_lookup_bootloader_address(struct mxt_data *data, bool retry)
 {
        u8 appmode = data->client->addr;
        u8 bootloader;
@@ -409,6 +398,12 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data)
        switch (appmode) {
        case 0x4a:
        case 0x4b:
+               /* Chips after 1664S use different scheme */
+               if (retry || data->info.family_id >= 0xa2) {
+                       bootloader = appmode - 0x24;
+                       break;
+               }
+               /* Fall through for normal case */
        case 0x4c:
        case 0x4d:
        case 0x5a:
@@ -426,6 +421,30 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data)
        return 0;
 }
 
+static int mxt_probe_bootloader(struct mxt_data *data, bool retry)
+{
+       struct device *dev = &data->client->dev;
+       int ret;
+       u8 val;
+       bool crc_failure;
+
+       ret = mxt_lookup_bootloader_address(data, retry);
+       if (ret)
+               return ret;
+
+       ret = mxt_bootloader_read(data, &val, 1);
+       if (ret)
+               return ret;
+
+       /* Check app crc fail mode */
+       crc_failure = (val & ~MXT_BOOT_STATUS_MASK) == MXT_APP_CRC_FAIL;
+
+       dev_err(dev, "Detected bootloader, status:%02X%s\n",
+                       val, crc_failure ? ", APP_CRC_FAIL" : "");
+
+       return 0;
+}
+
 static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val)
 {
        struct device *dev = &data->client->dev;
@@ -447,14 +466,15 @@ static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val)
        }
 }
 
-static int mxt_check_bootloader(struct mxt_data *data, unsigned int state)
+static int mxt_check_bootloader(struct mxt_data *data, unsigned int state,
+                               bool wait)
 {
        struct device *dev = &data->client->dev;
        u8 val;
        int ret;
 
 recheck:
-       if (state != MXT_WAITING_BOOTLOAD_CMD) {
+       if (wait) {
                /*
                 * In application update mode, the interrupt
                 * line signals state transitions. We must wait for the
@@ -485,6 +505,7 @@ recheck:
        switch (state) {
        case MXT_WAITING_BOOTLOAD_CMD:
        case MXT_WAITING_FRAME_DATA:
+       case MXT_APP_CRC_FAIL:
                val &= ~MXT_BOOT_STATUS_MASK;
                break;
        case MXT_FRAME_CRC_PASS:
@@ -508,13 +529,18 @@ recheck:
        return 0;
 }
 
-static int mxt_unlock_bootloader(struct mxt_data *data)
+static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock)
 {
        int ret;
        u8 buf[2];
 
-       buf[0] = MXT_UNLOCK_CMD_LSB;
-       buf[1] = MXT_UNLOCK_CMD_MSB;
+       if (unlock) {
+               buf[0] = MXT_UNLOCK_CMD_LSB;
+               buf[1] = MXT_UNLOCK_CMD_MSB;
+       } else {
+               buf[0] = 0x01;
+               buf[1] = 0x01;
+       }
 
        ret = mxt_bootloader_write(data, buf, 2);
        if (ret)
@@ -605,23 +631,41 @@ mxt_get_object(struct mxt_data *data, u8 type)
                        return object;
        }
 
-       dev_err(&data->client->dev, "Invalid object type T%u\n", type);
+       dev_warn(&data->client->dev, "Invalid object type T%u\n", type);
        return NULL;
 }
 
-static int mxt_read_message(struct mxt_data *data,
-                                struct mxt_message *message)
+static void mxt_proc_t6_messages(struct mxt_data *data, u8 *msg)
 {
-       struct mxt_object *object;
-       u16 reg;
+       struct device *dev = &data->client->dev;
+       u8 status = msg[1];
+       u32 crc = msg[2] | (msg[3] << 8) | (msg[4] << 16);
 
-       object = mxt_get_object(data, MXT_GEN_MESSAGE_T5);
-       if (!object)
-               return -EINVAL;
+       complete(&data->crc_completion);
 
-       reg = object->start_address;
-       return __mxt_read_reg(data->client, reg,
-                       sizeof(struct mxt_message), message);
+       if (crc != data->config_crc) {
+               data->config_crc = crc;
+               dev_dbg(dev, "T6 Config Checksum: 0x%06X\n", crc);
+       }
+
+       /* Detect reset */
+       if (status & MXT_T6_STATUS_RESET)
+               complete(&data->reset_completion);
+
+       /* Output debug if status has changed */
+       if (status != data->t6_status)
+               dev_dbg(dev, "T6 Status 0x%02X%s%s%s%s%s%s%s\n",
+                       status,
+                       status == 0 ? " OK" : "",
+                       status & MXT_T6_STATUS_RESET ? " RESET" : "",
+                       status & MXT_T6_STATUS_OFL ? " OFL" : "",
+                       status & MXT_T6_STATUS_SIGERR ? " SIGERR" : "",
+                       status & MXT_T6_STATUS_CAL ? " CAL" : "",
+                       status & MXT_T6_STATUS_CFGERR ? " CFGERR" : "",
+                       status & MXT_T6_STATUS_COMSERR ? " COMSERR" : "");
+
+       /* Save current status */
+       data->t6_status = status;
 }
 
 static int mxt_write_object(struct mxt_data *data,
@@ -638,7 +682,7 @@ static int mxt_write_object(struct mxt_data *data,
        return mxt_write_reg(data->client, reg + offset, val);
 }
 
-static void mxt_input_button(struct mxt_data *data, struct mxt_message *message)
+static void mxt_input_button(struct mxt_data *data, u8 *message)
 {
        struct input_dev *input = data->input_dev;
        const struct mxt_platform_data *pdata = data->pdata;
@@ -649,30 +693,33 @@ static void mxt_input_button(struct mxt_data *data, struct mxt_message *message)
        for (i = 0; i < pdata->t19_num_keys; i++) {
                if (pdata->t19_keymap[i] == KEY_RESERVED)
                        continue;
-               button = !(message->message[0] & (1 << i));
+               button = !(message[1] & (1 << i));
                input_report_key(input, pdata->t19_keymap[i], button);
        }
 }
 
-static void mxt_input_sync(struct input_dev *input_dev)
+static void mxt_input_sync(struct mxt_data *data)
 {
-       input_mt_report_pointer_emulation(input_dev, false);
-       input_sync(input_dev);
+       input_mt_report_pointer_emulation(data->input_dev,
+                                         data->pdata->t19_num_keys);
+       input_sync(data->input_dev);
 }
 
-static void mxt_input_touchevent(struct mxt_data *data,
-                                     struct mxt_message *message, int id)
+static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
 {
        struct device *dev = &data->client->dev;
-       u8 status = message->message[0];
        struct input_dev *input_dev = data->input_dev;
+       int id;
+       u8 status;
        int x;
        int y;
        int area;
        int amplitude;
 
-       x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf);
-       y = (message->message[2] << 4) | ((message->message[3] & 0xf));
+       id = message[0] - data->T9_reportid_min;
+       status = message[1];
+       x = (message[2] << 4) | ((message[4] >> 4) & 0xf);
+       y = (message[3] << 4) | ((message[4] & 0xf));
 
        /* Handle 10/12 bit switching */
        if (data->max_x < 1024)
@@ -680,8 +727,8 @@ static void mxt_input_touchevent(struct mxt_data *data,
        if (data->max_y < 1024)
                y >>= 2;
 
-       area = message->message[4];
-       amplitude = message->message[5];
+       area = message[5];
+       amplitude = message[6];
 
        dev_dbg(dev,
                "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n",
@@ -707,7 +754,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
                if (status & MXT_T9_RELEASE) {
                        input_mt_report_slot_state(input_dev,
                                                   MT_TOOL_FINGER, 0);
-                       mxt_input_sync(input_dev);
+                       mxt_input_sync(data);
                }
 
                /* Touch active */
@@ -720,64 +767,179 @@ static void mxt_input_touchevent(struct mxt_data *data,
                /* Touch no longer active, close out slot */
                input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 0);
        }
+
+       data->update_input = true;
+}
+
+static int mxt_proc_message(struct mxt_data *data, u8 *message)
+{
+       u8 report_id = message[0];
+
+       if (report_id == MXT_RPTID_NOMSG)
+               return 0;
+
+       if (report_id == data->T6_reportid) {
+               mxt_proc_t6_messages(data, message);
+       } else if (!data->input_dev) {
+               /*
+                * Do not report events if input device
+                * is not yet registered.
+                */
+               mxt_dump_message(data, message);
+       } else if (report_id >= data->T9_reportid_min
+           && report_id <= data->T9_reportid_max) {
+               mxt_proc_t9_message(data, message);
+       } else if (report_id == data->T19_reportid) {
+               mxt_input_button(data, message);
+               data->update_input = true;
+       } else {
+               mxt_dump_message(data, message);
+       }
+
+       return 1;
 }
 
-static u16 mxt_extract_T6_csum(const u8 *csum)
+static int mxt_read_and_process_messages(struct mxt_data *data, u8 count)
 {
-       return csum[0] | (csum[1] << 8) | (csum[2] << 16);
+       struct device *dev = &data->client->dev;
+       int ret;
+       int i;
+       u8 num_valid = 0;
+
+       /* Safety check for msg_buf */
+       if (count > data->max_reportid)
+               return -EINVAL;
+
+       /* Process remaining messages if necessary */
+       ret = __mxt_read_reg(data->client, data->T5_address,
+                               data->T5_msg_size * count, data->msg_buf);
+       if (ret) {
+               dev_err(dev, "Failed to read %u messages (%d)\n", count, ret);
+               return ret;
+       }
+
+       for (i = 0;  i < count; i++) {
+               ret = mxt_proc_message(data,
+                       data->msg_buf + data->T5_msg_size * i);
+
+               if (ret == 1)
+                       num_valid++;
+       }
+
+       /* return number of messages read */
+       return num_valid;
 }
 
-static bool mxt_is_T9_message(struct mxt_data *data, struct mxt_message *msg)
+static irqreturn_t mxt_process_messages_t44(struct mxt_data *data)
 {
-       u8 id = msg->reportid;
-       return (id >= data->T9_reportid_min && id <= data->T9_reportid_max);
+       struct device *dev = &data->client->dev;
+       int ret;
+       u8 count, num_left;
+
+       /* Read T44 and T5 together */
+       ret = __mxt_read_reg(data->client, data->T44_address,
+               data->T5_msg_size + 1, data->msg_buf);
+       if (ret) {
+               dev_err(dev, "Failed to read T44 and T5 (%d)\n", ret);
+               return IRQ_NONE;
+       }
+
+       count = data->msg_buf[0];
+
+       if (count == 0) {
+               dev_warn(dev, "Interrupt triggered but zero messages\n");
+               return IRQ_NONE;
+       } else if (count > data->max_reportid) {
+               dev_err(dev, "T44 count %d exceeded max report id\n", count);
+               count = data->max_reportid;
+       }
+
+       /* Process first message */
+       ret = mxt_proc_message(data, data->msg_buf + 1);
+       if (ret < 0) {
+               dev_warn(dev, "Unexpected invalid message\n");
+               return IRQ_NONE;
+       }
+
+       num_left = count - 1;
+
+       /* Process remaining messages if necessary */
+       if (num_left) {
+               ret = mxt_read_and_process_messages(data, num_left);
+               if (ret < 0)
+                       goto end;
+               else if (ret != num_left)
+                       dev_warn(dev, "Unexpected invalid message\n");
+       }
+
+end:
+       if (data->update_input) {
+               mxt_input_sync(data);
+               data->update_input = false;
+       }
+
+       return IRQ_HANDLED;
 }
 
-static irqreturn_t mxt_process_messages_until_invalid(struct mxt_data *data)
+static int mxt_process_messages_until_invalid(struct mxt_data *data)
 {
-       struct mxt_message message;
-       const u8 *payload = &message.message[0];
        struct device *dev = &data->client->dev;
-       u8 reportid;
-       bool update_input = false;
-       u32 crc;
+       int count, read;
+       u8 tries = 2;
+
+       count = data->max_reportid;
 
+       /* Read messages until we force an invalid */
        do {
-               if (mxt_read_message(data, &message)) {
-                       dev_err(dev, "Failed to read message\n");
-                       return IRQ_NONE;
-               }
+               read = mxt_read_and_process_messages(data, count);
+               if (read < count)
+                       return 0;
+       } while (--tries);
+
+       if (data->update_input) {
+               mxt_input_sync(data);
+               data->update_input = false;
+       }
 
-               reportid = message.reportid;
+       dev_err(dev, "CHG pin isn't cleared\n");
+       return -EBUSY;
+}
 
-               if (reportid == data->T6_reportid) {
-                       u8 status = payload[0];
+static irqreturn_t mxt_process_messages(struct mxt_data *data)
+{
+       int total_handled, num_handled;
+       u8 count = data->last_message_count;
 
-                       crc = mxt_extract_T6_csum(&payload[1]);
-                       if (crc != data->config_crc) {
-                               data->config_crc = crc;
-                               complete(&data->crc_completion);
-                       }
+       if (count < 1 || count > data->max_reportid)
+               count = 1;
 
-                       dev_dbg(dev, "Status: %02x Config Checksum: %06x\n",
-                               status, data->config_crc);
-
-                       if (status & MXT_T6_STATUS_RESET)
-                               complete(&data->reset_completion);
-               } else if (mxt_is_T9_message(data, &message)) {
-                       int id = reportid - data->T9_reportid_min;
-                       mxt_input_touchevent(data, &message, id);
-                       update_input = true;
-               } else if (message.reportid == data->T19_reportid) {
-                       mxt_input_button(data, &message);
-                       update_input = true;
-               } else {
-                       mxt_dump_message(dev, &message);
-               }
-       } while (reportid != 0xff);
+       /* include final invalid message */
+       total_handled = mxt_read_and_process_messages(data, count + 1);
+       if (total_handled < 0)
+               return IRQ_NONE;
+       /* if there were invalid messages, then we are done */
+       else if (total_handled <= count)
+               goto update_count;
+
+       /* keep reading two msgs until one is invalid or reportid limit */
+       do {
+               num_handled = mxt_read_and_process_messages(data, 2);
+               if (num_handled < 0)
+                       return IRQ_NONE;
+
+               total_handled += num_handled;
+
+               if (num_handled < 2)
+                       break;
+       } while (total_handled < data->num_touchids);
 
-       if (update_input)
-               mxt_input_sync(data->input_dev);
+update_count:
+       data->last_message_count = total_handled;
+
+       if (data->update_input) {
+               mxt_input_sync(data);
+               data->update_input = false;
+       }
 
        return IRQ_HANDLED;
 }
@@ -792,7 +954,14 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
                return IRQ_HANDLED;
        }
 
-       return mxt_process_messages_until_invalid(data);
+       if (!data->object_table)
+               return IRQ_HANDLED;
+
+       if (data->T44_address) {
+               return mxt_process_messages_t44(data);
+       } else {
+               return mxt_process_messages(data);
+       }
 }
 
 static int mxt_t6_command(struct mxt_data *data, u16 cmd_offset,
@@ -866,78 +1035,314 @@ static void mxt_update_crc(struct mxt_data *data, u8 cmd, u8 value)
        mxt_wait_for_completion(data, &data->crc_completion, MXT_CRC_TIMEOUT);
 }
 
-static int mxt_check_reg_init(struct mxt_data *data)
+static void mxt_calc_crc24(u32 *crc, u8 firstbyte, u8 secondbyte)
+{
+       static const unsigned int crcpoly = 0x80001B;
+       u32 result;
+       u32 data_word;
+
+       data_word = (secondbyte << 8) | firstbyte;
+       result = ((*crc << 1) ^ data_word);
+
+       if (result & 0x1000000)
+               result ^= crcpoly;
+
+       *crc = result;
+}
+
+static u32 mxt_calculate_crc(u8 *base, off_t start_off, off_t end_off)
+{
+       u32 crc = 0;
+       u8 *ptr = base + start_off;
+       u8 *last_val = base + end_off - 1;
+
+       if (end_off < start_off)
+               return -EINVAL;
+
+       while (ptr < last_val) {
+               mxt_calc_crc24(&crc, *ptr, *(ptr + 1));
+               ptr += 2;
+       }
+
+       /* if len is odd, fill the last byte with 0 */
+       if (ptr == last_val)
+               mxt_calc_crc24(&crc, *ptr, 0);
+
+       /* Mask to 24-bit */
+       crc &= 0x00FFFFFF;
+
+       return crc;
+}
+
+/*
+ * mxt_update_cfg - download configuration to chip
+ *
+ * Atmel Raw Config File Format
+ *
+ * The first four lines of the raw config file contain:
+ *  1) Version
+ *  2) Chip ID Information (first 7 bytes of device memory)
+ *  3) Chip Information Block 24-bit CRC Checksum
+ *  4) Chip Configuration 24-bit CRC Checksum
+ *
+ * The rest of the file consists of one line per object instance:
+ *   <TYPE> <INSTANCE> <SIZE> <CONTENTS>
+ *
+ *   <TYPE> - 2-byte object type as hex
+ *   <INSTANCE> - 2-byte object instance number as hex
+ *   <SIZE> - 2-byte object size as hex
+ *   <CONTENTS> - array of <SIZE> 1-byte hex values
+ */
+static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg)
 {
-       const struct mxt_platform_data *pdata = data->pdata;
-       struct mxt_object *object;
        struct device *dev = &data->client->dev;
-       int index = 0;
-       int i, size;
+       struct mxt_info cfg_info;
+       struct mxt_object *object;
        int ret;
+       int offset;
+       int data_pos;
+       int byte_offset;
+       int i;
+       int cfg_start_ofs;
+       u32 info_crc, config_crc, calculated_crc;
+       u8 *config_mem;
+       size_t config_mem_size;
+       unsigned int type, instance, size;
+       u8 val;
+       u16 reg;
 
-       if (!pdata->config) {
-               dev_dbg(dev, "No cfg data defined, skipping reg init\n");
-               return 0;
+       mxt_update_crc(data, MXT_COMMAND_REPORTALL, 1);
+
+       if (strncmp(cfg->data, MXT_CFG_MAGIC, strlen(MXT_CFG_MAGIC))) {
+               dev_err(dev, "Unrecognised config file\n");
+               ret = -EINVAL;
+               goto release;
        }
 
-       mxt_update_crc(data, MXT_COMMAND_REPORTALL, 1);
+       data_pos = strlen(MXT_CFG_MAGIC);
+
+       /* Load information block and check */
+       for (i = 0; i < sizeof(struct mxt_info); i++) {
+               ret = sscanf(cfg->data + data_pos, "%hhx%n",
+                            (unsigned char *)&cfg_info + i,
+                            &offset);
+               if (ret != 1) {
+                       dev_err(dev, "Bad format\n");
+                       ret = -EINVAL;
+                       goto release;
+               }
 
-       if (data->config_crc == pdata->config_crc) {
-               dev_info(dev, "Config CRC 0x%06X: OK\n", data->config_crc);
-               return 0;
+               data_pos += offset;
        }
 
-       dev_info(dev, "Config CRC 0x%06X: does not match 0x%06X\n",
-                data->config_crc, pdata->config_crc);
+       if (cfg_info.family_id != data->info.family_id) {
+               dev_err(dev, "Family ID mismatch!\n");
+               ret = -EINVAL;
+               goto release;
+       }
 
-       for (i = 0; i < data->info.object_num; i++) {
-               object = data->object_table + i;
+       if (cfg_info.variant_id != data->info.variant_id) {
+               dev_err(dev, "Variant ID mismatch!\n");
+               ret = -EINVAL;
+               goto release;
+       }
+
+       /* Read CRCs */
+       ret = sscanf(cfg->data + data_pos, "%x%n", &info_crc, &offset);
+       if (ret != 1) {
+               dev_err(dev, "Bad format: failed to parse Info CRC\n");
+               ret = -EINVAL;
+               goto release;
+       }
+       data_pos += offset;
+
+       ret = sscanf(cfg->data + data_pos, "%x%n", &config_crc, &offset);
+       if (ret != 1) {
+               dev_err(dev, "Bad format: failed to parse Config CRC\n");
+               ret = -EINVAL;
+               goto release;
+       }
+       data_pos += offset;
+
+       /*
+        * The Info Block CRC is calculated over mxt_info and the object
+        * table. If it does not match then we are trying to load the
+        * configuration from a different chip or firmware version, so
+        * the configuration CRC is invalid anyway.
+        */
+       if (info_crc == data->info_crc) {
+               if (config_crc == 0 || data->config_crc == 0) {
+                       dev_info(dev, "CRC zero, attempting to apply config\n");
+               } else if (config_crc == data->config_crc) {
+                       dev_dbg(dev, "Config CRC 0x%06X: OK\n",
+                                data->config_crc);
+                       ret = 0;
+                       goto release;
+               } else {
+                       dev_info(dev, "Config CRC 0x%06X: does not match file 0x%06X\n",
+                                data->config_crc, config_crc);
+               }
+       } else {
+               dev_warn(dev,
+                        "Warning: Info CRC error - device=0x%06X file=0x%06X\n",
+                        data->info_crc, info_crc);
+       }
+
+       /* Malloc memory to store configuration */
+       cfg_start_ofs = MXT_OBJECT_START +
+                       data->info.object_num * sizeof(struct mxt_object) +
+                       MXT_INFO_CHECKSUM_SIZE;
+       config_mem_size = data->mem_size - cfg_start_ofs;
+       config_mem = kzalloc(config_mem_size, GFP_KERNEL);
+       if (!config_mem) {
+               dev_err(dev, "Failed to allocate memory\n");
+               ret = -ENOMEM;
+               goto release;
+       }
 
-               if (!mxt_object_writable(object->type))
+       while (data_pos < cfg->size) {
+               /* Read type, instance, length */
+               ret = sscanf(cfg->data + data_pos, "%x %x %x%n",
+                            &type, &instance, &size, &offset);
+               if (ret == 0) {
+                       /* EOF */
+                       break;
+               } else if (ret != 3) {
+                       dev_err(dev, "Bad format: failed to parse object\n");
+                       ret = -EINVAL;
+                       goto release_mem;
+               }
+               data_pos += offset;
+
+               object = mxt_get_object(data, type);
+               if (!object) {
+                       /* Skip object */
+                       for (i = 0; i < size; i++) {
+                               ret = sscanf(cfg->data + data_pos, "%hhx%n",
+                                            &val,
+                                            &offset);
+                               data_pos += offset;
+                       }
                        continue;
+               }
 
-               size = mxt_obj_size(object) * mxt_obj_instances(object);
-               if (index + size > pdata->config_length) {
-                       dev_err(dev, "Not enough config data!\n");
-                       return -EINVAL;
+               if (size > mxt_obj_size(object)) {
+                       /*
+                        * Either we are in fallback mode due to wrong
+                        * config or config from a later fw version,
+                        * or the file is corrupt or hand-edited.
+                        */
+                       dev_warn(dev, "Discarding %zu byte(s) in T%u\n",
+                                size - mxt_obj_size(object), type);
+               } else if (mxt_obj_size(object) > size) {
+                       /*
+                        * If firmware is upgraded, new bytes may be added to
+                        * end of objects. It is generally forward compatible
+                        * to zero these bytes - previous behaviour will be
+                        * retained. However this does invalidate the CRC and
+                        * will force fallback mode until the configuration is
+                        * updated. We warn here but do nothing else - the
+                        * malloc has zeroed the entire configuration.
+                        */
+                       dev_warn(dev, "Zeroing %zu byte(s) in T%d\n",
+                                mxt_obj_size(object) - size, type);
                }
 
-               ret = __mxt_write_reg(data->client, object->start_address,
-                               size, &pdata->config[index]);
-               if (ret)
-                       return ret;
-               index += size;
+               if (instance >= mxt_obj_instances(object)) {
+                       dev_err(dev, "Object instances exceeded!\n");
+                       ret = -EINVAL;
+                       goto release_mem;
+               }
+
+               reg = object->start_address + mxt_obj_size(object) * instance;
+
+               for (i = 0; i < size; i++) {
+                       ret = sscanf(cfg->data + data_pos, "%hhx%n",
+                                    &val,
+                                    &offset);
+                       if (ret != 1) {
+                               dev_err(dev, "Bad format in T%d\n", type);
+                               ret = -EINVAL;
+                               goto release_mem;
+                       }
+                       data_pos += offset;
+
+                       if (i > mxt_obj_size(object))
+                               continue;
+
+                       byte_offset = reg + i - cfg_start_ofs;
+
+                       if ((byte_offset >= 0)
+                           && (byte_offset <= config_mem_size)) {
+                               *(config_mem + byte_offset) = val;
+                       } else {
+                               dev_err(dev, "Bad object: reg:%d, T%d, ofs=%d\n",
+                                       reg, object->type, byte_offset);
+                               ret = -EINVAL;
+                               goto release_mem;
+                       }
+               }
+       }
+
+       /* Calculate crc of the received configs (not the raw config file) */
+       if (data->T7_address < cfg_start_ofs) {
+               dev_err(dev, "Bad T7 address, T7addr = %x, config offset %x\n",
+                       data->T7_address, cfg_start_ofs);
+               ret = 0;
+               goto release_mem;
+       }
+
+       calculated_crc = mxt_calculate_crc(config_mem,
+                                          data->T7_address - cfg_start_ofs,
+                                          config_mem_size);
+
+       if (config_crc > 0 && (config_crc != calculated_crc))
+               dev_warn(dev, "Config CRC error, calculated=%06X, file=%06X\n",
+                        calculated_crc, config_crc);
+
+       /* Write configuration as blocks */
+       byte_offset = 0;
+       while (byte_offset < config_mem_size) {
+               size = config_mem_size - byte_offset;
+
+               if (size > MXT_MAX_BLOCK_WRITE)
+                       size = MXT_MAX_BLOCK_WRITE;
+
+               ret = __mxt_write_reg(data->client,
+                                     cfg_start_ofs + byte_offset,
+                                     size, config_mem + byte_offset);
+               if (ret != 0) {
+                       dev_err(dev, "Config write error, ret=%d\n", ret);
+                       goto release_mem;
+               }
+
+               byte_offset += size;
        }
 
        mxt_update_crc(data, MXT_COMMAND_BACKUPNV, MXT_BACKUP_VALUE);
 
        ret = mxt_soft_reset(data);
        if (ret)
-               return ret;
+               goto release_mem;
 
        dev_info(dev, "Config successfully updated\n");
 
-       return 0;
+release_mem:
+       kfree(config_mem);
+release:
+       release_firmware(cfg);
+       return ret;
 }
 
-static int mxt_make_highchg(struct mxt_data *data)
+static int mxt_acquire_irq(struct mxt_data *data)
 {
-       struct device *dev = &data->client->dev;
-       struct mxt_message message;
-       int count = 10;
        int error;
 
-       /* Read dummy message to make high CHG pin */
-       do {
-               error = mxt_read_message(data, &message);
-               if (error)
-                       return error;
-       } while (message.reportid != 0xff && --count);
+       enable_irq(data->irq);
 
-       if (!count) {
-               dev_err(dev, "CHG pin isn't cleared\n");
-               return -EBUSY;
-       }
+       error = mxt_process_messages_until_invalid(data);
+       if (error)
+               return error;
 
        return 0;
 }
@@ -956,24 +1361,55 @@ static int mxt_get_info(struct mxt_data *data)
        return 0;
 }
 
+static void mxt_free_object_table(struct mxt_data *data)
+{
+       input_unregister_device(data->input_dev);
+       data->input_dev = NULL;
+
+       kfree(data->object_table);
+       data->object_table = NULL;
+       kfree(data->msg_buf);
+       data->msg_buf = NULL;
+       data->T5_address = 0;
+       data->T5_msg_size = 0;
+       data->T6_reportid = 0;
+       data->T7_address = 0;
+       data->T9_reportid_min = 0;
+       data->T9_reportid_max = 0;
+       data->T19_reportid = 0;
+       data->T44_address = 0;
+       data->max_reportid = 0;
+}
+
 static int mxt_get_object_table(struct mxt_data *data)
 {
        struct i2c_client *client = data->client;
        size_t table_size;
+       struct mxt_object *object_table;
        int error;
        int i;
        u8 reportid;
+       u16 end_address;
 
        table_size = data->info.object_num * sizeof(struct mxt_object);
+       object_table = kzalloc(table_size, GFP_KERNEL);
+       if (!object_table) {
+               dev_err(&data->client->dev, "Failed to allocate memory\n");
+               return -ENOMEM;
+       }
+
        error = __mxt_read_reg(client, MXT_OBJECT_START, table_size,
-                       data->object_table);
-       if (error)
+                       object_table);
+       if (error) {
+               kfree(object_table);
                return error;
+       }
 
        /* Valid Report IDs start counting from 1 */
        reportid = 1;
+       data->mem_size = 0;
        for (i = 0; i < data->info.object_num; i++) {
-               struct mxt_object *object = data->object_table + i;
+               struct mxt_object *object = object_table + i;
                u8 min_id, max_id;
 
                le16_to_cpus(&object->start_address);
@@ -995,31 +1431,71 @@ static int mxt_get_object_table(struct mxt_data *data)
                        min_id, max_id);
 
                switch (object->type) {
+               case MXT_GEN_MESSAGE_T5:
+                       if (data->info.family_id == 0x80) {
+                               /*
+                                * On mXT224 read and discard unused CRC byte
+                                * otherwise DMA reads are misaligned
+                                */
+                               data->T5_msg_size = mxt_obj_size(object);
+                       } else {
+                               /* CRC not enabled, so skip last byte */
+                               data->T5_msg_size = mxt_obj_size(object) - 1;
+                       }
+                       data->T5_address = object->start_address;
                case MXT_GEN_COMMAND_T6:
                        data->T6_reportid = min_id;
                        data->T6_address = object->start_address;
                        break;
+               case MXT_GEN_POWER_T7:
+                       data->T7_address = object->start_address;
+                       break;
                case MXT_TOUCH_MULTI_T9:
                        data->T9_reportid_min = min_id;
                        data->T9_reportid_max = max_id;
+                       data->num_touchids = object->num_report_ids
+                                               * mxt_obj_instances(object);
+                       break;
+               case MXT_SPT_MESSAGECOUNT_T44:
+                       data->T44_address = object->start_address;
                        break;
                case MXT_SPT_GPIOPWM_T19:
                        data->T19_reportid = min_id;
                        break;
                }
+
+               end_address = object->start_address
+                       + mxt_obj_size(object) * mxt_obj_instances(object) - 1;
+
+               if (end_address >= data->mem_size)
+                       data->mem_size = end_address + 1;
+       }
+
+       /* Store maximum reportid */
+       data->max_reportid = reportid;
+
+       /* If T44 exists, T5 position has to be directly after */
+       if (data->T44_address && (data->T5_address != data->T44_address + 1)) {
+               dev_err(&client->dev, "Invalid T44 position\n");
+               error = -EINVAL;
+               goto free_object_table;
+       }
+
+       data->msg_buf = kcalloc(data->max_reportid,
+                               data->T5_msg_size, GFP_KERNEL);
+       if (!data->msg_buf) {
+               dev_err(&client->dev, "Failed to allocate message buffer\n");
+               error = -ENOMEM;
+               goto free_object_table;
        }
 
+       data->object_table = object_table;
+
        return 0;
-}
-
-static void mxt_free_object_table(struct mxt_data *data)
-{
-       kfree(data->object_table);
-       data->object_table = NULL;
-       data->T6_reportid = 0;
-       data->T9_reportid_min = 0;
-       data->T9_reportid_max = 0;
-       data->T19_reportid = 0;
+
+free_object_table:
+       mxt_free_object_table(data);
+       return error;
 }
 
 static int mxt_read_t9_resolution(struct mxt_data *data)
@@ -1070,55 +1546,195 @@ static int mxt_read_t9_resolution(struct mxt_data *data)
        return 0;
 }
 
+static int mxt_input_open(struct input_dev *dev);
+static void mxt_input_close(struct input_dev *dev);
+
+static int mxt_initialize_t9_input_device(struct mxt_data *data)
+{
+       struct device *dev = &data->client->dev;
+       const struct mxt_platform_data *pdata = data->pdata;
+       struct input_dev *input_dev;
+       int error;
+       unsigned int num_mt_slots;
+       unsigned int mt_flags = 0;
+       int i;
+
+       error = mxt_read_t9_resolution(data);
+       if (error)
+               dev_warn(dev, "Failed to initialize T9 resolution\n");
+
+       input_dev = input_allocate_device();
+       if (!input_dev) {
+               dev_err(dev, "Failed to allocate memory\n");
+               return -ENOMEM;
+       }
+
+       input_dev->name = "Atmel maXTouch Touchscreen";
+       input_dev->phys = data->phys;
+       input_dev->id.bustype = BUS_I2C;
+       input_dev->dev.parent = dev;
+       input_dev->open = mxt_input_open;
+       input_dev->close = mxt_input_close;
+
+       __set_bit(EV_ABS, input_dev->evbit);
+       __set_bit(EV_KEY, input_dev->evbit);
+       __set_bit(BTN_TOUCH, input_dev->keybit);
+
+       if (pdata->t19_num_keys) {
+               __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
+
+               for (i = 0; i < pdata->t19_num_keys; i++)
+                       if (pdata->t19_keymap[i] != KEY_RESERVED)
+                               input_set_capability(input_dev, EV_KEY,
+                                                    pdata->t19_keymap[i]);
+
+               mt_flags |= INPUT_MT_POINTER;
+
+               input_abs_set_res(input_dev, ABS_X, MXT_PIXELS_PER_MM);
+               input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM);
+               input_abs_set_res(input_dev, ABS_MT_POSITION_X,
+                                 MXT_PIXELS_PER_MM);
+               input_abs_set_res(input_dev, ABS_MT_POSITION_Y,
+                                 MXT_PIXELS_PER_MM);
+
+               input_dev->name = "Atmel maXTouch Touchpad";
+       }
+
+       /* For single touch */
+       input_set_abs_params(input_dev, ABS_X,
+                            0, data->max_x, 0, 0);
+       input_set_abs_params(input_dev, ABS_Y,
+                            0, data->max_y, 0, 0);
+       input_set_abs_params(input_dev, ABS_PRESSURE,
+                            0, 255, 0, 0);
+
+       /* For multi touch */
+       num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
+       error = input_mt_init_slots(input_dev, num_mt_slots, mt_flags);
+       if (error) {
+               dev_err(dev, "Error %d initialising slots\n", error);
+               goto err_free_mem;
+       }
+
+       input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
+                            0, MXT_MAX_AREA, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_POSITION_X,
+                            0, data->max_x, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
+                            0, data->max_y, 0, 0);
+       input_set_abs_params(input_dev, ABS_MT_PRESSURE,
+                            0, 255, 0, 0);
+
+       input_set_drvdata(input_dev, data);
+
+       error = input_register_device(input_dev);
+       if (error) {
+               dev_err(dev, "Error %d registering input device\n", error);
+               goto err_free_mem;
+       }
+
+       data->input_dev = input_dev;
+
+       return 0;
+
+err_free_mem:
+       input_free_device(input_dev);
+       return error;
+}
+
+static int mxt_configure_objects(struct mxt_data *data,
+                                const struct firmware *cfg);
+
+static void mxt_config_cb(const struct firmware *cfg, void *ctx)
+{
+       mxt_configure_objects(ctx, cfg);
+}
+
 static int mxt_initialize(struct mxt_data *data)
 {
        struct i2c_client *client = data->client;
-       struct mxt_info *info = &data->info;
        int error;
+       bool alt_bootloader_addr = false;
+       bool retry = false;
 
+retry_info:
        error = mxt_get_info(data);
-       if (error)
-               return error;
+       if (error) {
+retry_bootloader:
+               error = mxt_probe_bootloader(data, alt_bootloader_addr);
+               if (error) {
+                       if (alt_bootloader_addr) {
+                               /* Chip is not in appmode or bootloader mode */
+                               return error;
+                       }
 
-       data->object_table = kcalloc(info->object_num,
-                                    sizeof(struct mxt_object),
-                                    GFP_KERNEL);
-       if (!data->object_table) {
-               dev_err(&client->dev, "Failed to allocate memory\n");
-               return -ENOMEM;
+                       dev_info(&client->dev, "Trying alternate bootloader address\n");
+                       alt_bootloader_addr = true;
+                       goto retry_bootloader;
+               } else {
+                       if (retry) {
+                               dev_err(&client->dev, "Could not recover from bootloader mode\n");
+                               /*
+                                * We can reflash from this state, so do not
+                                * abort init
+                                */
+                               data->in_bootloader = true;
+                               return 0;
+                       }
+
+                       /* Attempt to exit bootloader into app mode */
+                       mxt_send_bootloader_cmd(data, false);
+                       msleep(MXT_FW_RESET_TIME);
+                       retry = true;
+                       goto retry_info;
+               }
        }
 
        /* Get object table information */
        error = mxt_get_object_table(data);
        if (error) {
                dev_err(&client->dev, "Error %d reading object table\n", error);
-               goto err_free_object_table;
+               return error;
        }
 
-       /* Check register init values */
-       error = mxt_check_reg_init(data);
-       if (error) {
-               dev_err(&client->dev, "Error %d initializing configuration\n",
-                       error);
+       mxt_acquire_irq(data);
+       if (error)
                goto err_free_object_table;
-       }
 
-       error = mxt_read_t9_resolution(data);
-       if (error) {
-               dev_err(&client->dev, "Failed to initialize T9 resolution\n");
-               goto err_free_object_table;
+       request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
+                               &data->client->dev, GFP_KERNEL, data,
+                               mxt_config_cb);
+
+       return 0;
+
+err_free_object_table:
+       mxt_free_object_table(data);
+       return error;
+}
+
+static int mxt_configure_objects(struct mxt_data *data,
+                                const struct firmware *cfg)
+{
+       struct device *dev = &data->client->dev;
+       struct mxt_info *info = &data->info;
+       int error;
+
+       if (cfg) {
+               error = mxt_update_cfg(data, cfg);
+               if (error)
+                       dev_warn(dev, "Error %d updating config\n", error);
        }
 
-       dev_info(&client->dev,
+       error = mxt_initialize_t9_input_device(data);
+       if (error)
+               return error;
+
+       dev_info(dev,
                 "Family: %u Variant: %u Firmware V%u.%u.%02X Objects: %u\n",
                 info->family_id, info->variant_id, info->version >> 4,
                 info->version & 0xf, info->build, info->object_num);
 
        return 0;
-
-err_free_object_table:
-       mxt_free_object_table(data);
-       return error;
 }
 
 /* Firmware Version is returned as Major.Minor.Build */
@@ -1246,30 +1862,45 @@ static int mxt_load_fw(struct device *dev, const char *fn)
        if (ret)
                goto release_firmware;
 
-       ret = mxt_lookup_bootloader_address(data);
-       if (ret)
-               goto release_firmware;
+       if (!data->in_bootloader) {
+               /* Change to the bootloader mode */
+               data->in_bootloader = true;
 
-       /* Change to the bootloader mode */
-       data->in_bootloader = true;
+               ret = mxt_t6_command(data, MXT_COMMAND_RESET,
+                                    MXT_BOOT_VALUE, false);
+               if (ret)
+                       goto release_firmware;
 
-       ret = mxt_t6_command(data, MXT_COMMAND_RESET, MXT_BOOT_VALUE, false);
-       if (ret)
-               goto release_firmware;
+               msleep(MXT_RESET_TIME);
 
-       msleep(MXT_RESET_TIME);
+               /* Do not need to scan since we know family ID */
+               ret = mxt_lookup_bootloader_address(data, 0);
+               if (ret)
+                       goto release_firmware;
+       } else {
+               enable_irq(data->irq);
+       }
 
+       mxt_free_object_table(data);
        reinit_completion(&data->bl_completion);
 
-       ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD);
-       if (ret)
-               goto disable_irq;
+       ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD, false);
+       if (ret) {
+               /* Bootloader may still be unlocked from previous attempt */
+               ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, false);
+               if (ret)
+                       goto disable_irq;
+       } else {
+               dev_info(dev, "Unlocking bootloader\n");
 
-       /* Unlock bootloader */
-       mxt_unlock_bootloader(data);
+               /* Unlock bootloader */
+               ret = mxt_send_bootloader_cmd(data, true);
+               if (ret)
+                       goto disable_irq;
+       }
 
        while (pos < fw->size) {
-               ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA);
+               ret = mxt_check_bootloader(data, MXT_WAITING_FRAME_DATA, true);
                if (ret)
                        goto disable_irq;
 
@@ -1283,7 +1914,7 @@ static int mxt_load_fw(struct device *dev, const char *fn)
                if (ret)
                        goto disable_irq;
 
-               ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS);
+               ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS, true);
                if (ret) {
                        retry++;
 
@@ -1343,13 +1974,7 @@ static ssize_t mxt_update_fw_store(struct device *dev,
        } else {
                dev_info(dev, "The firmware update succeeded\n");
 
-               mxt_free_object_table(data);
-
-               mxt_initialize(data);
-
-               enable_irq(data->irq);
-
-               error = mxt_make_highchg(data);
+               error = mxt_initialize(data);
                if (error)
                        return error;
        }
@@ -1404,138 +2029,112 @@ static void mxt_input_close(struct input_dev *dev)
        mxt_stop(data);
 }
 
-static int mxt_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+#ifdef CONFIG_OF
+static struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client)
+{
+       struct mxt_platform_data *pdata;
+       u32 *keymap;
+       u32 keycode;
+       int proplen, i, ret;
+
+       if (!client->dev.of_node)
+               return ERR_PTR(-ENODEV);
+
+       pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
+               return ERR_PTR(-ENOMEM);
+
+       if (of_find_property(client->dev.of_node, "linux,gpio-keymap",
+                            &proplen)) {
+               pdata->t19_num_keys = proplen / sizeof(u32);
+
+               keymap = devm_kzalloc(&client->dev,
+                               pdata->t19_num_keys * sizeof(keymap[0]),
+                               GFP_KERNEL);
+               if (!keymap)
+                       return ERR_PTR(-ENOMEM);
+
+               for (i = 0; i < pdata->t19_num_keys; i++) {
+                       ret = of_property_read_u32_index(client->dev.of_node,
+                                       "linux,gpio-keymap", i, &keycode);
+                       if (ret)
+                               keycode = KEY_RESERVED;
+
+                       keymap[i] = keycode;
+               }
+
+               pdata->t19_keymap = keymap;
+       }
+
+       return pdata;
+}
+#else
+static struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client)
+{
+       dev_dbg(&client->dev, "No platform data specified\n");
+       return ERR_PTR(-EINVAL);
+}
+#endif
+
+static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
-       const struct mxt_platform_data *pdata = dev_get_platdata(&client->dev);
        struct mxt_data *data;
-       struct input_dev *input_dev;
+       const struct mxt_platform_data *pdata;
        int error;
-       unsigned int num_mt_slots;
-       unsigned int mt_flags = 0;
-       int i;
 
-       if (!pdata)
-               return -EINVAL;
+       pdata = dev_get_platdata(&client->dev);
+       if (!pdata) {
+               pdata = mxt_parse_dt(client);
+               if (IS_ERR(pdata))
+                       return PTR_ERR(pdata);
+       }
 
        data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
-       input_dev = input_allocate_device();
-       if (!data || !input_dev) {
+       if (!data) {
                dev_err(&client->dev, "Failed to allocate memory\n");
-               error = -ENOMEM;
-               goto err_free_mem;
+               return -ENOMEM;
        }
 
-       input_dev->name = "Atmel maXTouch Touchscreen";
        snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
                 client->adapter->nr, client->addr);
 
-       input_dev->phys = data->phys;
-
-       input_dev->id.bustype = BUS_I2C;
-       input_dev->dev.parent = &client->dev;
-       input_dev->open = mxt_input_open;
-       input_dev->close = mxt_input_close;
-
        data->client = client;
-       data->input_dev = input_dev;
        data->pdata = pdata;
        data->irq = client->irq;
+       i2c_set_clientdata(client, data);
 
        init_completion(&data->bl_completion);
        init_completion(&data->reset_completion);
        init_completion(&data->crc_completion);
 
-       error = mxt_initialize(data);
-       if (error)
-               goto err_free_mem;
-
-       __set_bit(EV_ABS, input_dev->evbit);
-       __set_bit(EV_KEY, input_dev->evbit);
-       __set_bit(BTN_TOUCH, input_dev->keybit);
-
-       if (pdata->t19_num_keys) {
-               __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
-
-               for (i = 0; i < pdata->t19_num_keys; i++)
-                       if (pdata->t19_keymap[i] != KEY_RESERVED)
-                               input_set_capability(input_dev, EV_KEY,
-                                                    pdata->t19_keymap[i]);
-
-               mt_flags |= INPUT_MT_POINTER;
-
-               input_abs_set_res(input_dev, ABS_X, MXT_PIXELS_PER_MM);
-               input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM);
-               input_abs_set_res(input_dev, ABS_MT_POSITION_X,
-                                 MXT_PIXELS_PER_MM);
-               input_abs_set_res(input_dev, ABS_MT_POSITION_Y,
-                                 MXT_PIXELS_PER_MM);
-
-               input_dev->name = "Atmel maXTouch Touchpad";
-       }
-
-       /* For single touch */
-       input_set_abs_params(input_dev, ABS_X,
-                            0, data->max_x, 0, 0);
-       input_set_abs_params(input_dev, ABS_Y,
-                            0, data->max_y, 0, 0);
-       input_set_abs_params(input_dev, ABS_PRESSURE,
-                            0, 255, 0, 0);
-
-       /* For multi touch */
-       num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
-       error = input_mt_init_slots(input_dev, num_mt_slots, mt_flags);
-       if (error)
-               goto err_free_object;
-       input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
-                            0, MXT_MAX_AREA, 0, 0);
-       input_set_abs_params(input_dev, ABS_MT_POSITION_X,
-                            0, data->max_x, 0, 0);
-       input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
-                            0, data->max_y, 0, 0);
-       input_set_abs_params(input_dev, ABS_MT_PRESSURE,
-                            0, 255, 0, 0);
-
-       input_set_drvdata(input_dev, data);
-       i2c_set_clientdata(client, data);
-
        error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
                                     pdata->irqflags | IRQF_ONESHOT,
                                     client->name, data);
        if (error) {
                dev_err(&client->dev, "Failed to register interrupt\n");
-               goto err_free_object;
+               goto err_free_mem;
        }
 
-       error = mxt_make_highchg(data);
-       if (error)
-               goto err_free_irq;
+       disable_irq(client->irq);
 
-       error = input_register_device(input_dev);
-       if (error) {
-               dev_err(&client->dev, "Error %d registering input device\n",
-                       error);
+       error = mxt_initialize(data);
+       if (error)
                goto err_free_irq;
-       }
 
        error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
        if (error) {
                dev_err(&client->dev, "Failure %d creating sysfs group\n",
                        error);
-               goto err_unregister_device;
+               goto err_free_object;
        }
 
        return 0;
 
-err_unregister_device:
-       input_unregister_device(input_dev);
-       input_dev = NULL;
+err_free_object:
+       mxt_free_object_table(data);
 err_free_irq:
        free_irq(client->irq, data);
-err_free_object:
-       kfree(data->object_table);
 err_free_mem:
-       input_free_device(input_dev);
        kfree(data);
        return error;
 }
@@ -1547,7 +2146,7 @@ static int mxt_remove(struct i2c_client *client)
        sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
        free_irq(data->irq, data);
        input_unregister_device(data->input_dev);
-       kfree(data->object_table);
+       mxt_free_object_table(data);
        kfree(data);
 
        return 0;
@@ -1591,6 +2190,12 @@ static int mxt_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
 
+static const struct of_device_id mxt_of_match[] = {
+       { .compatible = "atmel,maxtouch", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, mxt_of_match);
+
 static const struct i2c_device_id mxt_id[] = {
        { "qt602240_ts", 0 },
        { "atmel_mxt_ts", 0 },
@@ -1604,6 +2209,7 @@ static struct i2c_driver mxt_driver = {
        .driver = {
                .name   = "atmel_mxt_ts",
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(mxt_of_match),
                .pm     = &mxt_pm_ops,
        },
        .probe          = mxt_probe,
index d4f3399..5a6d50c 100644 (file)
@@ -733,8 +733,7 @@ edt_ft5x06_ts_prepare_debugfs(struct edt_ft5x06_ts_data *tsdata,
 static void
 edt_ft5x06_ts_teardown_debugfs(struct edt_ft5x06_ts_data *tsdata)
 {
-       if (tsdata->debug_dir)
-               debugfs_remove_recursive(tsdata->debug_dir);
+       debugfs_remove_recursive(tsdata->debug_dir);
        kfree(tsdata->raw_buffer);
 }
 
index 19cb247..5a69ded 100644 (file)
@@ -264,7 +264,7 @@ static int s3c2410ts_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       clk_enable(ts.clock);
+       clk_prepare_enable(ts.clock);
        dev_dbg(dev, "got and enabled clocks\n");
 
        ts.irq_tc = ret = platform_get_irq(pdev, 0);
@@ -369,7 +369,7 @@ static int s3c2410ts_remove(struct platform_device *pdev)
        free_irq(ts.irq_tc, ts.input);
        del_timer_sync(&touch_timer);
 
-       clk_disable(ts.clock);
+       clk_disable_unprepare(ts.clock);
        clk_put(ts.clock);
 
        input_unregister_device(ts.input);
index feea85b..8ba48f5 100644 (file)
@@ -29,6 +29,8 @@
 #include <linux/sysfs.h>
 #include <linux/input/mt.h>
 #include <linux/platform_data/zforce_ts.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
@@ -117,6 +119,8 @@ struct zforce_ts {
        const struct zforce_ts_platdata *pdata;
        char                    phys[32];
 
+       struct regulator        *reg_vdd;
+
        bool                    suspending;
        bool                    suspended;
        bool                    boot_complete;
@@ -690,6 +694,11 @@ static void zforce_reset(void *data)
        struct zforce_ts *ts = data;
 
        gpio_set_value(ts->pdata->gpio_rst, 0);
+
+       udelay(10);
+
+       if (!IS_ERR(ts->reg_vdd))
+               regulator_disable(ts->reg_vdd);
 }
 
 static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
@@ -765,10 +774,32 @@ static int zforce_probe(struct i2c_client *client,
                return ret;
        }
 
+       ts->reg_vdd = devm_regulator_get_optional(&client->dev, "vdd");
+       if (IS_ERR(ts->reg_vdd)) {
+               ret = PTR_ERR(ts->reg_vdd);
+               if (ret == -EPROBE_DEFER)
+                       return ret;
+       } else {
+               ret = regulator_enable(ts->reg_vdd);
+               if (ret)
+                       return ret;
+
+               /*
+                * according to datasheet add 100us grace time after regular
+                * regulator enable delay.
+                */
+               udelay(100);
+       }
+
        ret = devm_add_action(&client->dev, zforce_reset, ts);
        if (ret) {
                dev_err(&client->dev, "failed to register reset action, %d\n",
                        ret);
+
+               /* hereafter the regulator will be disabled by the action */
+               if (!IS_ERR(ts->reg_vdd))
+                       regulator_disable(ts->reg_vdd);
+
                return ret;
        }
 
index 7f1a2e2..67b316b 100644 (file)
@@ -97,8 +97,6 @@ static struct mxt_platform_data atmel_224s_tp_platform_data = {
        .irqflags               = IRQF_TRIGGER_FALLING,
        .t19_num_keys           = ARRAY_SIZE(mxt_t19_keys),
        .t19_keymap             = mxt_t19_keys,
-       .config                 = NULL,
-       .config_length          = 0,
 };
 
 static struct i2c_board_info atmel_224s_tp_device = {
@@ -109,8 +107,6 @@ static struct i2c_board_info atmel_224s_tp_device = {
 
 static struct mxt_platform_data atmel_1664s_platform_data = {
        .irqflags               = IRQF_TRIGGER_FALLING,
-       .config                 = NULL,
-       .config_length          = 0,
 };
 
 static struct i2c_board_info atmel_1664s_device = {
index 3891dc1..02bf6ea 100644 (file)
@@ -17,9 +17,6 @@
 
 /* The platform data for the Atmel maXTouch touchscreen driver */
 struct mxt_platform_data {
-       const u8 *config;
-       size_t config_length;
-       u32 config_crc;
        unsigned long irqflags;
        u8 t19_num_keys;
        const unsigned int *t19_keymap;
index 9f53fa7..becdd78 100644 (file)
@@ -76,5 +76,6 @@
 #define SERIO_HAMPSHIRE        0x3b
 #define SERIO_PS2MULT  0x3c
 #define SERIO_TSC40    0x3d
+#define SERIO_WACOM_IV 0x3e
 
 #endif /* _UAPI_SERIO_H */
index 0389b48..baeab83 100644 (file)
@@ -84,6 +84,15 @@ struct uinput_ff_erase {
  */
 #define UI_GET_SYSNAME(len)    _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len)
 
+/**
+ * UI_GET_VERSION - Return version of uinput protocol
+ *
+ * This writes uinput protocol version implemented by the kernel into
+ * the integer pointed to by the ioctl argument. The protocol version
+ * is hard-coded in the kernel and is independent of the uinput device.
+ */
+#define UI_GET_VERSION         _IOR(UINPUT_IOCTL_BASE, 301, unsigned int)
+
 /*
  * To write a force-feedback-capable driver, the upload_effect
  * and erase_effect callbacks in input_dev must be implemented.