Hi Dmitry,
On 19-10-28 21:12, Dmitry Torokhov wrote:
> On Tue, Oct 29, 2019 at 01:58:04AM +0100, Ondrej Jirman wrote:
> > From: Mylène Josserand <mylene.josserand@xxxxxxxxxxx>
> >
> > Add the support for enabling optional regulator that may be used as VCC
> > source.
> >
> > Signed-off-by: Ondrej Jirman <megous@xxxxxxxxxx>
> > Signed-off-by: Mylène Josserand <mylene.josserand@xxxxxxxxxxx>
>
> Applied, thank you.
What happens with my vdd patches?
Regards,
Marco
>
> > ---
> > drivers/input/touchscreen/edt-ft5x06.c | 30 ++++++++++++++++++++++++++
> > 1 file changed, 30 insertions(+)
> >
> > diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
> > index 5525f1fb1526..d61731c0037d 100644
> > --- a/drivers/input/touchscreen/edt-ft5x06.c
> > +++ b/drivers/input/touchscreen/edt-ft5x06.c
> > @@ -28,6 +28,7 @@
> > #include <linux/input/mt.h>
> > #include <linux/input/touchscreen.h>
> > #include <asm/unaligned.h>
> > +#include <linux/regulator/consumer.h>
> >
> > #define WORK_REGISTER_THRESHOLD 0x00
> > #define WORK_REGISTER_REPORT_RATE 0x08
> > @@ -88,6 +89,7 @@ struct edt_ft5x06_ts_data {
> > struct touchscreen_properties prop;
> > u16 num_x;
> > u16 num_y;
> > + struct regulator *vcc;
> >
> > struct gpio_desc *reset_gpio;
> > struct gpio_desc *wake_gpio;
> > @@ -1036,6 +1038,13 @@ edt_ft5x06_ts_set_regs(struct edt_ft5x06_ts_data *tsdata)
> > }
> > }
> >
> > +static void edt_ft5x06_disable_regulator(void *arg)
> > +{
> > + struct edt_ft5x06_ts_data *data = arg;
> > +
> > + regulator_disable(data->vcc);
> > +}
> > +
> > static int edt_ft5x06_ts_probe(struct i2c_client *client,
> > const struct i2c_device_id *id)
> > {
> > @@ -1064,6 +1073,27 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
> >
> > tsdata->max_support_points = chip_data->max_support_points;
> >
> > + tsdata->vcc = devm_regulator_get(&client->dev, "vcc");
> > + if (IS_ERR(tsdata->vcc)) {
> > + error = PTR_ERR(tsdata->vcc);
> > + if (error != -EPROBE_DEFER)
> > + dev_err(&client->dev,
> > + "failed to request regulator: %d\n", error);
> > + return error;
> > + }
> > +
> > + error = regulator_enable(tsdata->vcc);
> > + if (error < 0) {
> > + dev_err(&client->dev, "failed to enable vcc: %d\n", error);
> > + return error;
> > + }
> > +
> > + error = devm_add_action_or_reset(&client->dev,
> > + edt_ft5x06_disable_regulator,
> > + tsdata);
> > + if (error)
> > + return error;
> > +
> > tsdata->reset_gpio = devm_gpiod_get_optional(&client->dev,
> > "reset", GPIOD_OUT_HIGH);
> > if (IS_ERR(tsdata->reset_gpio)) {
> > --
> > 2.23.0
> >
>
> --
> Dmitry
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
