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

Pull input updates from Dmitry Torokhov:
 - big update to Wacom driver by Benjamin Tissoires, converting it to
   HID infrastructure and unifying USB and Bluetooth models
 - large update to ALPS driver by Hans de Goede, which adds support for
   newer touchpad models as well as cleans up and restructures the code
 - more changes to Atmel MXT driver, including device tree support
 - new driver for iPaq x3xxx touchscreen
 - driver for serial Wacom tablets
 - driver for Microchip's CAP1106
 - assorted cleanups and improvements to existing drover and input core

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (93 commits)
  Input: wacom - update the ABI doc according to latest changes
  Input: wacom - only register once the MODULE_* macros
  Input: HID - remove hid-wacom Bluetooth driver
  Input: wacom - add copyright note and bump version to 2.0
  Input: wacom - remove passing id for wacom_set_report
  Input: wacom - check for bluetooth protocol while setting OLEDs
  Input: wacom - handle Intuos 4 BT in wacom.ko
  Input: wacom - handle Graphire BT tablets in wacom.ko
  Input: wacom - prepare the driver to include BT devices
  Input: hyperv-keyboard - register as a wakeup source
  Input: imx_keypad - remove ifdef round PM methods
  Input: jornada720_ts - get rid of space indentation and use tab
  Input: jornada720_ts - switch to using managed resources
  Input: alps - Rushmore and v7 resolution support
  Input: mcs5000_ts - remove ifdef around power management methods
  Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEP
  Input: ads7846 - release resources on failure for clean exit
  Input: wacom - add support for 0x12C ISDv4 sensor
  Input: atmel_mxt_ts - use deep sleep mode when stopped
  ARM: dts: am437x-gp-evm: Update binding for touchscreen size
  ...

5 files changed, 364 insertions, 33 deletions

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index f7e79b481349..a3958c63d7d5 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -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
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 7504ae19049d..0a3345634d79 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -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
index 000000000000..f7d7a0d4ab4e
--- /dev/null
+++ b/drivers/input/keyboard/cap1106.c
@@ -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");
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index 8280cb16260b..20a99c368d16 100644
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -531,8 +531,7 @@ static int imx_keypad_probe(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int imx_kbd_suspend(struct device *dev)
+static int __maybe_unused imx_kbd_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct imx_keypad *kbd = platform_get_drvdata(pdev);
@@ -552,7 +551,7 @@ static int imx_kbd_suspend(struct device *dev)
         return 0;
 }
 
-static int imx_kbd_resume(struct device *dev)
+static int __maybe_unused imx_kbd_resume(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct imx_keypad *kbd = platform_get_drvdata(pdev);
@@ -575,7 +574,6 @@ err_clk:
 
         return ret;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume);
 
diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
index 430b54539720..faa6da53eba8 100644
--- a/drivers/input/keyboard/max7359_keypad.c
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -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,
 };