lkml.org 
[lkml]   [2014]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 7/8] Input: pixcir_i2c_ts: Add device tree support
    Date
    Provide device tree support and binding information.
    Also provide support for a new chip "pixcir_tangoc".

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
    ---
    .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 26 ++++++++
    .../devicetree/bindings/vendor-prefixes.txt | 1 +
    drivers/input/touchscreen/pixcir_i2c_ts.c | 78 ++++++++++++++++++++++
    3 files changed, 105 insertions(+)
    create mode 100644 Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt

    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
    index 0000000..0ab9505
    --- /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
    +- x-size: horizontal resolution of touchscreen
    +- y-size: vertical resolution of touchscreen
    +
    +Example:
    +
    + i2c@00000000 {
    + /* ... */
    +
    + pixcir_ts@5c {
    + compatible = "pixcir,pixcir_ts";
    + reg = <0x5c>;
    + interrupts = <2 0>;
    + attb-gpio = <&gpf 2 0 2>;
    + x-size = <800>;
    + y-size = <600>;
    + };
    +
    + /* ... */
    + };
    diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
    index 40ce2df..d2324b7 100644
    --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
    +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
    @@ -65,6 +65,7 @@ onnn ON Semiconductor Corp.
    panasonic Panasonic Corporation
    phytec PHYTEC Messtechnik GmbH
    picochip Picochip 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 8ca258b..bb6b42a 100644
    --- 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 */

    @@ -404,16 +407,70 @@ 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, "x-size", &pdata->x_max)) {
    + dev_err(dev, "Failed to get x-size property\n");
    + return ERR_PTR(-EINVAL);
    + }
    + pdata->x_max -= 1;
    +
    + if (of_property_read_u32(np, "y-size", &pdata->y_max)) {
    + dev_err(dev, "Failed to get y-size 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;
    @@ -524,15 +581,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,
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-27 09:41    [W:4.592 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site