| Message ID | 20190129102347.27754-2-martink@posteo.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | None | expand |
Martin Kepplinger | Entwicklung Software GINZINGER ELECTRONIC SYSTEMS GMBH Tel.: +43 7723 5422 157 Mail: martin.kepplinger@ginzinger.com Web: www.ginzinger.com On 29.01.19 11:23, Martin Kepplinger wrote: > From: Martin Kepplinger <martin.kepplinger@ginzinger.com> > > Use devm_gpiod_get_optional() and gpiod_set_value_cansleep() instead > of the old API. The st1232_ts_power() now passes on the inverted "poweron" > value to reflect the correct logical value. > > Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> > --- > > Tested and works. thanks for your help Dmitry, > is this what you had in mind? any problems or questions? thanks martin > > > > drivers/input/touchscreen/st1232.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c > index 777df903605d..04d75b08be44 100644 > --- a/drivers/input/touchscreen/st1232.c > +++ b/drivers/input/touchscreen/st1232.c > @@ -45,7 +45,7 @@ struct st1232_ts_data { > struct i2c_client *client; > struct input_dev *input_dev; > struct dev_pm_qos_request low_latency_req; > - int reset_gpio; > + struct gpio_desc *reset_gpio; > const struct st_chip_info *chip_info; > int read_buf_len; > u8 *read_buf; > @@ -142,8 +142,8 @@ static irqreturn_t st1232_ts_irq_handler(int irq, void *dev_id) > > static void st1232_ts_power(struct st1232_ts_data *ts, bool poweron) > { > - if (gpio_is_valid(ts->reset_gpio)) > - gpio_direction_output(ts->reset_gpio, poweron); > + if (ts->reset_gpio) > + gpiod_set_value_cansleep(ts->reset_gpio, !poweron); > } > > static const struct st_chip_info st1232_chip_info = { > @@ -215,15 +215,13 @@ static int st1232_ts_probe(struct i2c_client *client, > ts->client = client; > ts->input_dev = input_dev; > > - ts->reset_gpio = of_get_gpio(client->dev.of_node, 0); > - if (gpio_is_valid(ts->reset_gpio)) { > - error = devm_gpio_request(&client->dev, ts->reset_gpio, NULL); > - if (error) { > - dev_err(&client->dev, > - "Unable to request GPIO pin %d.\n", > - ts->reset_gpio); > - return error; > - } > + ts->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", > + GPIOD_OUT_HIGH); > + if (IS_ERR(ts->reset_gpio)) { > + error = PTR_ERR(ts->reset_gpio); > + dev_err(&client->dev, "Unable to request GPIO pin: %d.\n", > + error); > + return error; > } > > st1232_ts_power(ts, true); >
Hi Martin, On Tue, Feb 05, 2019 at 11:20:16AM +0100, Martin Kepplinger wrote: > On 29.01.19 11:23, Martin Kepplinger wrote: > > From: Martin Kepplinger <martin.kepplinger@ginzinger.com> > > > > Use devm_gpiod_get_optional() and gpiod_set_value_cansleep() instead > > of the old API. The st1232_ts_power() now passes on the inverted "poweron" > > value to reflect the correct logical value. > > > > Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> > > --- > > > > Tested and works. thanks for your help Dmitry, > > > > is this what you had in mind? any problems or questions? Yes, that is what I wanted, with one exception: > > + ts->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", > > + GPIOD_OUT_HIGH); This breaks compatibility with old DTSes, please try changing to: devm_gpiod_get_optional(&client->dev, NULL, GPIOD_OUT_HIGH); Thanks.
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index 777df903605d..04d75b08be44 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c @@ -45,7 +45,7 @@ struct st1232_ts_data { struct i2c_client *client; struct input_dev *input_dev; struct dev_pm_qos_request low_latency_req; - int reset_gpio; + struct gpio_desc *reset_gpio; const struct st_chip_info *chip_info; int read_buf_len; u8 *read_buf; @@ -142,8 +142,8 @@ static irqreturn_t st1232_ts_irq_handler(int irq, void *dev_id) static void st1232_ts_power(struct st1232_ts_data *ts, bool poweron) { - if (gpio_is_valid(ts->reset_gpio)) - gpio_direction_output(ts->reset_gpio, poweron); + if (ts->reset_gpio) + gpiod_set_value_cansleep(ts->reset_gpio, !poweron); } static const struct st_chip_info st1232_chip_info = { @@ -215,15 +215,13 @@ static int st1232_ts_probe(struct i2c_client *client, ts->client = client; ts->input_dev = input_dev; - ts->reset_gpio = of_get_gpio(client->dev.of_node, 0); - if (gpio_is_valid(ts->reset_gpio)) { - error = devm_gpio_request(&client->dev, ts->reset_gpio, NULL); - if (error) { - dev_err(&client->dev, - "Unable to request GPIO pin %d.\n", - ts->reset_gpio); - return error; - } + ts->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", + GPIOD_OUT_HIGH); + if (IS_ERR(ts->reset_gpio)) { + error = PTR_ERR(ts->reset_gpio); + dev_err(&client->dev, "Unable to request GPIO pin: %d.\n", + error); + return error; } st1232_ts_power(ts, true);