Input: pixcir_i2c_ts - add device tree support

Provide device tree support and binding information.  Also provide support
for a new chip "pixcir_tangoc".

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt
new file mode 100644 (file)
index 0000000..6e55109
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt
@@ -0,0 +1,26 @@
+* Pixcir I2C touchscreen controllers
+
+Required properties:
+- compatible: must be "pixcir,pixcir_ts" or "pixcir,pixcir_tangoc"
+- reg: I2C address of the chip
+- interrupts: interrupt to which the chip is connected
+- attb-gpio: GPIO connected to the ATTB line of the chip
+- touchscreen-size-x: horizontal resolution of touchscreen (in pixels)
+- touchscreen-size-y: vertical resolution of touchscreen (in pixels)
+
+Example:
+
+       i2c@00000000 {
+               /* ... */
+
+               pixcir_ts@5c {
+                       compatible = "pixcir,pixcir_ts";
+                       reg = <0x5c>;
+                       interrupts = <2 0>;
+                       attb-gpio = <&gpf 2 0 2>;
+                       touchscreen-size-x = <800>;
+                       touchscreen-size-y = <600>;
+               };
+
+               /* ... */
+       };

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 46a311e728a86c713274ec1075e1f1fa82d4a472..91bd2287f0c779aad51acb78298340ce03713169 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -99,6 +99,7 @@ panasonic     Panasonic Corporation
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 plathome       Plat'Home Co., Ltd.
+pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 powervr        PowerVR (deprecated, use img)
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index eddda520a1a7f60721ca0f2fad1dc3b1b9ca8a88..fc49c75317d124462bea7c610fcf5741c8fa554c 100644 (file)
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -26,6 +26,9 @@
 #include <linux/input/mt.h>
 #include <linux/input/pixcir_ts.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.h>
 
 #define PIXCIR_MAX_SLOTS       5 /* Max fingers supported by driver */
 
@@ -407,16 +410,69 @@ unlock:
 static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops,
                         pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume);
 
+#ifdef CONFIG_OF
+static const struct of_device_id pixcir_of_match[];
+
+static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
+{
+       struct pixcir_ts_platform_data *pdata;
+       struct device_node *np = dev->of_node;
+       const struct of_device_id *match;
+
+       match = of_match_device(of_match_ptr(pixcir_of_match), dev);
+       if (!match)
+               return ERR_PTR(-EINVAL);
+
+       pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+       if (!pdata)
+               return ERR_PTR(-ENOMEM);
+
+       pdata->chip = *(const struct pixcir_i2c_chip_data *)match->data;
+
+       pdata->gpio_attb = of_get_named_gpio(np, "attb-gpio", 0);
+       /* gpio_attb validity is checked in probe */
+
+       if (of_property_read_u32(np, "touchscreen-size-x", &pdata->x_max)) {
+               dev_err(dev, "Failed to get touchscreen-size-x property\n");
+               return ERR_PTR(-EINVAL);
+       }
+       pdata->x_max -= 1;
+
+       if (of_property_read_u32(np, "touchscreen-size-y", &pdata->y_max)) {
+               dev_err(dev, "Failed to get touchscreen-size-y property\n");
+               return ERR_PTR(-EINVAL);
+       }
+       pdata->y_max -= 1;
+
+       dev_dbg(dev, "%s: x %d, y %d, gpio %d\n", __func__,
+               pdata->x_max + 1, pdata->y_max + 1, pdata->gpio_attb);
+
+       return pdata;
+}
+#else
+static struct pixcir_ts_platform_data *pixcir_parse_dt(struct device *dev)
+{
+       return ERR_PTR(-EINVAL);
+}
+#endif
+
 static int pixcir_i2c_ts_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
        const struct pixcir_ts_platform_data *pdata =
                        dev_get_platdata(&client->dev);
        struct device *dev = &client->dev;
+       struct device_node *np = dev->of_node;
        struct pixcir_i2c_ts_data *tsdata;
        struct input_dev *input;
        int error;
 
+       if (np && !pdata) {
+               pdata = pixcir_parse_dt(dev);
+               if (IS_ERR(pdata))
+                       return PTR_ERR(pdata);
+       }
+
        if (!pdata) {
                dev_err(&client->dev, "platform data not defined\n");
                return -EINVAL;
@@ -522,15 +578,36 @@ static int pixcir_i2c_ts_remove(struct i2c_client *client)
 
 static const struct i2c_device_id pixcir_i2c_ts_id[] = {
        { "pixcir_ts", 0 },
+       { "pixcir_tangoc", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pixcir_i2c_ts_id);
 
+#ifdef CONFIG_OF
+static const struct pixcir_i2c_chip_data pixcir_ts_data = {
+       .max_fingers = 2,
+       /* no hw id support */
+};
+
+static const struct pixcir_i2c_chip_data pixcir_tangoc_data = {
+       .max_fingers = 5,
+       .has_hw_ids = true,
+};
+
+static const struct of_device_id pixcir_of_match[] = {
+       { .compatible = "pixcir,pixcir_ts", .data = &pixcir_ts_data },
+       { .compatible = "pixcir,pixcir_tangoc", .data = &pixcir_tangoc_data },
+       { }
+};
+MODULE_DEVICE_TABLE(of, pixcir_of_match);
+#endif
+
 static struct i2c_driver pixcir_i2c_ts_driver = {
        .driver = {
                .owner  = THIS_MODULE,
                .name   = "pixcir_ts",
                .pm     = &pixcir_dev_pm_ops,
+               .of_match_table = of_match_ptr(pixcir_of_match),
        },
        .probe          = pixcir_i2c_ts_probe,
        .remove         = pixcir_i2c_ts_remove,