Hi Martijn,
On 19-05-14 23:21, Martijn Braam wrote:
> Add a regulator supply request for the controller power
>
> Signed-off-by: Martijn Braam <martijn@xxxxxxxxx>
> ---
> drivers/input/touchscreen/edt-ft5x06.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
> index 702bfda7ee77..226c623f8d46 100644
> --- a/drivers/input/touchscreen/edt-ft5x06.c
> +++ b/drivers/input/touchscreen/edt-ft5x06.c
> @@ -29,6 +29,7 @@
> #include <linux/ratelimit.h>
> #include <linux/irq.h>
> #include <linux/interrupt.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/input.h>
> #include <linux/i2c.h>
> #include <linux/kernel.h>
> @@ -103,6 +104,7 @@ struct edt_ft5x06_ts_data {
>
> struct gpio_desc *reset_gpio;
> struct gpio_desc *wake_gpio;
> + struct regulator *vdd;
>
> #if defined(CONFIG_DEBUG_FS)
> struct dentry *debug_dir;
> @@ -1092,6 +1094,22 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
> return error;
> }
>
> + tsdata->vdd = devm_regulator_get(&client->dev, "vdd");
> + if (IS_ERR(tsdata->vdd)) {
> + error = PTR_ERR(tsdata->vdd);
> + if (error != -EPROBE_DEFER)
> + dev_err(&client->dev,
> + "Failed to get vdd regulator: %d\n", error);
> + return error;
This will break current device tree's and this should never happen. So
we need to make this regulator optional.
BTW:
Did you changed the bindings too?
Regards,
Marco
> + }
> +
> + /* power the controller */
> + error = regulator_enable(tsdata->vdd);
> + if (error) {
> + dev_err(&client->dev, "Controller fail to enable vdd\n");
> + return error;
> + }
> +
> tsdata->wake_gpio = devm_gpiod_get_optional(&client->dev,
> "wake", GPIOD_OUT_LOW);
> if (IS_ERR(tsdata->wake_gpio)) {
> @@ -1204,6 +1222,7 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client)
> {
> struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
>
> + regulator_disable(tsdata->vdd);
> edt_ft5x06_ts_teardown_debugfs(tsdata);
>
> return 0;
> --
> 2.21.0
>
>
--
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 |
