From: Richard Leitner <richard.leitner@skidata.com> To: <dmitry.torokhov@gmail.com>, <robh+dt@kernel.org>, <mark.rutland@arm.com> Cc: <linux-input@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Richard Leitner <richard.leitner@skidata.com> Subject: [PATCH 2/7] Input: sx8654 - add reset-gpio support Date: Tue, 16 Oct 2018 11:16:48 +0200 [thread overview] Message-ID: <20181016091653.26896-3-richard.leitner@skidata.com> (raw) In-Reply-To: <20181016091653.26896-1-richard.leitner@skidata.com> The sx8654 features a NRST input which may be connected to a GPIO. Therefore add support for hard-resetting the sx8654 via this NRST. If the reset-gpio property is provided the sx8654 is resetted via NRST instead of the soft-reset via I2C. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- drivers/input/touchscreen/sx8654.c | 88 ++++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c index ed29db3ec731..059127490c8d 100644 --- a/drivers/input/touchscreen/sx8654.c +++ b/drivers/input/touchscreen/sx8654.c @@ -33,6 +33,8 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <linux/gpio/consumer.h> +#include <linux/delay.h> /* register addresses */ #define I2C_REG_TOUCH0 0x00 @@ -74,6 +76,7 @@ struct sx8654 { struct input_dev *input; struct i2c_client *client; + struct gpio_desc *gpio_reset; }; static irqreturn_t sx8654_irq(int irq, void *handle) @@ -124,6 +127,27 @@ static irqreturn_t sx8654_irq(int irq, void *handle) return IRQ_HANDLED; } +static int sx8654_reset(struct sx8654 *ts) +{ + int err; + + if (ts->gpio_reset) { + gpiod_set_value_cansleep(ts->gpio_reset, 1); + udelay(2); /* Tpulse > 1µs */ + gpiod_set_value_cansleep(ts->gpio_reset, 0); + + return 0; + } + + dev_dbg(&ts->client->dev, "NRST unavailable, try softreset\n"); + err = i2c_smbus_write_byte_data(ts->client, I2C_REG_SOFTRESET, + SOFTRESET_VALUE); + if (err) + return err; + + return 0; +} + static int sx8654_open(struct input_dev *dev) { struct sx8654 *sx8654 = input_get_drvdata(dev); @@ -171,6 +195,44 @@ static void sx8654_close(struct input_dev *dev) } } +#ifdef CONFIG_OF +static int sx8654_get_ofdata(struct sx8654 *ts) +{ + struct device *dev = &ts->client->dev; + struct device_node *node = dev->of_node; + int err; + + if (!node) { + ts->gpio_reset = NULL; + return 0; + } + + ts->gpio_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (PTR_ERR(ts->gpio_reset) == -EPROBE_DEFER) { + return -EPROBE_DEFER; + } else if (IS_ERR(ts->gpio_reset)) { + err = PTR_ERR(ts->gpio_reset); + dev_err(dev, "unable to request GPIO reset pin (%d)\n", err); + return err; + } + dev_dbg(dev, "got GPIO reset pin\n"); + + return 0; +} + +static const struct of_device_id sx8654_of_match[] = { + { .compatible = "semtech,sx8654", }, + { }, +}; +MODULE_DEVICE_TABLE(of, sx8654_of_match); +#else /* CONFIG_OF */ +static int sx8654_get_ofdata(struct sx8654 *ts) +{ + ts->gpio_reset = NULL; + return 0; +} +#endif /* CONFIG_OF */ + static int sx8654_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -186,10 +248,20 @@ static int sx8654_probe(struct i2c_client *client, if (!sx8654) return -ENOMEM; + sx8654->client = client; + + error = sx8654_get_ofdata(sx8654); + if (error) { + dev_err(&client->dev, "get_ofdata failed: %d\n", error); + return error; + } + input = devm_input_allocate_device(&client->dev); if (!input) return -ENOMEM; + sx8654->input = input; + input->name = "SX8654 I2C Touchscreen"; input->id.bustype = BUS_I2C; input->dev.parent = &client->dev; @@ -201,15 +273,11 @@ static int sx8654_probe(struct i2c_client *client, input_set_abs_params(input, ABS_X, 0, MAX_12BIT, 0, 0); input_set_abs_params(input, ABS_Y, 0, MAX_12BIT, 0, 0); - sx8654->client = client; - sx8654->input = input; - input_set_drvdata(sx8654->input, sx8654); - error = i2c_smbus_write_byte_data(client, I2C_REG_SOFTRESET, - SOFTRESET_VALUE); + error = sx8654_reset(sx8654); if (error) { - dev_err(&client->dev, "writing softreset value failed"); + dev_err(&client->dev, "reset failed"); return error; } @@ -256,14 +324,6 @@ static int sx8654_probe(struct i2c_client *client, return 0; } -#ifdef CONFIG_OF -static const struct of_device_id sx8654_of_match[] = { - { .compatible = "semtech,sx8654", }, - { }, -}; -MODULE_DEVICE_TABLE(of, sx8654_of_match); -#endif - static const struct i2c_device_id sx8654_id_table[] = { { "semtech_sx8654", 0 }, { }, -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Richard Leitner <richard.leitner@skidata.com> To: dmitry.torokhov@gmail.com, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner <richard.leitner@skidata.com> Subject: [PATCH 2/7] Input: sx8654 - add reset-gpio support Date: Tue, 16 Oct 2018 11:16:48 +0200 [thread overview] Message-ID: <20181016091653.26896-3-richard.leitner@skidata.com> (raw) In-Reply-To: <20181016091653.26896-1-richard.leitner@skidata.com> The sx8654 features a NRST input which may be connected to a GPIO. Therefore add support for hard-resetting the sx8654 via this NRST. If the reset-gpio property is provided the sx8654 is resetted via NRST instead of the soft-reset via I2C. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- drivers/input/touchscreen/sx8654.c | 88 ++++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c index ed29db3ec731..059127490c8d 100644 --- a/drivers/input/touchscreen/sx8654.c +++ b/drivers/input/touchscreen/sx8654.c @@ -33,6 +33,8 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <linux/gpio/consumer.h> +#include <linux/delay.h> /* register addresses */ #define I2C_REG_TOUCH0 0x00 @@ -74,6 +76,7 @@ struct sx8654 { struct input_dev *input; struct i2c_client *client; + struct gpio_desc *gpio_reset; }; static irqreturn_t sx8654_irq(int irq, void *handle) @@ -124,6 +127,27 @@ static irqreturn_t sx8654_irq(int irq, void *handle) return IRQ_HANDLED; } +static int sx8654_reset(struct sx8654 *ts) +{ + int err; + + if (ts->gpio_reset) { + gpiod_set_value_cansleep(ts->gpio_reset, 1); + udelay(2); /* Tpulse > 1µs */ + gpiod_set_value_cansleep(ts->gpio_reset, 0); + + return 0; + } + + dev_dbg(&ts->client->dev, "NRST unavailable, try softreset\n"); + err = i2c_smbus_write_byte_data(ts->client, I2C_REG_SOFTRESET, + SOFTRESET_VALUE); + if (err) + return err; + + return 0; +} + static int sx8654_open(struct input_dev *dev) { struct sx8654 *sx8654 = input_get_drvdata(dev); @@ -171,6 +195,44 @@ static void sx8654_close(struct input_dev *dev) } } +#ifdef CONFIG_OF +static int sx8654_get_ofdata(struct sx8654 *ts) +{ + struct device *dev = &ts->client->dev; + struct device_node *node = dev->of_node; + int err; + + if (!node) { + ts->gpio_reset = NULL; + return 0; + } + + ts->gpio_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (PTR_ERR(ts->gpio_reset) == -EPROBE_DEFER) { + return -EPROBE_DEFER; + } else if (IS_ERR(ts->gpio_reset)) { + err = PTR_ERR(ts->gpio_reset); + dev_err(dev, "unable to request GPIO reset pin (%d)\n", err); + return err; + } + dev_dbg(dev, "got GPIO reset pin\n"); + + return 0; +} + +static const struct of_device_id sx8654_of_match[] = { + { .compatible = "semtech,sx8654", }, + { }, +}; +MODULE_DEVICE_TABLE(of, sx8654_of_match); +#else /* CONFIG_OF */ +static int sx8654_get_ofdata(struct sx8654 *ts) +{ + ts->gpio_reset = NULL; + return 0; +} +#endif /* CONFIG_OF */ + static int sx8654_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -186,10 +248,20 @@ static int sx8654_probe(struct i2c_client *client, if (!sx8654) return -ENOMEM; + sx8654->client = client; + + error = sx8654_get_ofdata(sx8654); + if (error) { + dev_err(&client->dev, "get_ofdata failed: %d\n", error); + return error; + } + input = devm_input_allocate_device(&client->dev); if (!input) return -ENOMEM; + sx8654->input = input; + input->name = "SX8654 I2C Touchscreen"; input->id.bustype = BUS_I2C; input->dev.parent = &client->dev; @@ -201,15 +273,11 @@ static int sx8654_probe(struct i2c_client *client, input_set_abs_params(input, ABS_X, 0, MAX_12BIT, 0, 0); input_set_abs_params(input, ABS_Y, 0, MAX_12BIT, 0, 0); - sx8654->client = client; - sx8654->input = input; - input_set_drvdata(sx8654->input, sx8654); - error = i2c_smbus_write_byte_data(client, I2C_REG_SOFTRESET, - SOFTRESET_VALUE); + error = sx8654_reset(sx8654); if (error) { - dev_err(&client->dev, "writing softreset value failed"); + dev_err(&client->dev, "reset failed"); return error; } @@ -256,14 +324,6 @@ static int sx8654_probe(struct i2c_client *client, return 0; } -#ifdef CONFIG_OF -static const struct of_device_id sx8654_of_match[] = { - { .compatible = "semtech,sx8654", }, - { }, -}; -MODULE_DEVICE_TABLE(of, sx8654_of_match); -#endif - static const struct i2c_device_id sx8654_id_table[] = { { "semtech_sx8654", 0 }, { }, -- 2.11.0
next prev parent reply other threads:[~2018-10-16 9:28 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-16 9:16 [PATCH 0/7] Input: sx8654 - reset-gpio, sx865[056] support, etc Richard Leitner 2018-10-16 9:16 ` Richard Leitner 2018-10-16 9:16 ` [PATCH 1/7] dt-bindings: input: touchscreen: sx8654: add reset-gpio property Richard Leitner 2018-10-16 9:16 ` Richard Leitner 2018-10-16 9:16 ` Richard Leitner [this message] 2018-10-16 9:16 ` [PATCH 2/7] Input: sx8654 - add reset-gpio support Richard Leitner 2018-10-16 17:39 ` Dmitry Torokhov 2018-10-16 19:32 ` Richard Leitner 2018-10-16 19:32 ` Richard Leitner 2018-10-16 9:16 ` [PATCH 3/7] dt-bindings: input: touchscreen: sx8654: add compatible models Richard Leitner 2018-10-16 9:16 ` Richard Leitner 2018-10-16 9:16 ` [PATCH 4/7] Input: sx8654 - add sx8655 and sx8656 to compatibles Richard Leitner 2018-10-16 9:16 ` Richard Leitner 2018-10-16 9:22 ` [PATCH 5/7] dt-bindings: input: touchscreen: sx8654: add sx8650 to comatibles Richard Leitner 2018-10-16 9:22 ` Richard Leitner 2018-10-16 9:22 ` [PATCH 6/7] Input: sx8654 - add sx8650 support Richard Leitner 2018-10-16 9:22 ` Richard Leitner 2018-10-16 17:48 ` Dmitry Torokhov 2018-10-16 19:34 ` Richard Leitner 2018-10-16 19:34 ` Richard Leitner 2018-10-16 20:18 ` Dmitry Torokhov 2018-10-16 9:23 ` [PATCH 7/7] Input: sx8654 - use common of_touchscreen functions Richard Leitner 2018-10-16 9:23 ` Richard Leitner 2018-10-16 17:52 ` Dmitry Torokhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181016091653.26896-3-richard.leitner@skidata.com \ --to=richard.leitner@skidata.com \ --cc=devicetree@vger.kernel.org \ --cc=dmitry.torokhov@gmail.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.