Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d257f298 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Dmitry Torokhov
Browse files

Input: tsc2005 - convert to gpiod 



The GPIOD API can be used from boardcode, so that the DT check can be
removed. To avoid breaking existing boardcode, _optional() variant has been
chosen. For completely removing the DT check, the regulator has also been
made optional, so that it could be supplied from boardcode.

As a side-effect the patch fixes the after-probe reset GPIO state, so that
the device is not kept in reset state.

Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 80b46aa6

drivers/input/touchscreen/tsc2005.c

+18 −29
Original line number Original line Diff line number Diff line
@@ -30,11 +30,11 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/spi/tsc2005.h>

#include <linux/spi/tsc2005.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/gpio/consumer.h>





/*

/*

 * The touchscreen interface operates as follows:

 * The touchscreen interface operates as follows:
@@ -180,7 +180,7 @@ struct tsc2005 { 




	struct regulator	*vio;

	struct regulator	*vio;





	int			reset_gpio;

	struct gpio_desc	*reset_gpio;

	void			(*set_reset)(bool enable);

	void			(*set_reset)(bool enable);

};

};
@@ -318,8 +318,8 @@ static void tsc2005_stop_scan(struct tsc2005 *ts) 




static void tsc2005_set_reset(struct tsc2005 *ts, bool enable)

static void tsc2005_set_reset(struct tsc2005 *ts, bool enable)

{

{

	if (ts->reset_gpio >= 0)

	if (ts->reset_gpio)

		gpio_set_value(ts->reset_gpio, enable);

		gpiod_set_value_cansleep(ts->reset_gpio, enable);

	else if (ts->set_reset)

	else if (ts->set_reset)

		ts->set_reset(enable);

		ts->set_reset(enable);

}

}
@@ -611,34 +611,23 @@ static int tsc2005_probe(struct spi_device *spi) 
	ts->x_plate_ohm = x_plate_ohm;

	ts->x_plate_ohm = x_plate_ohm;

	ts->esd_timeout = esd_timeout;

	ts->esd_timeout = esd_timeout;





	if (np) {

	ts->reset_gpio = devm_gpiod_get_optional(&spi->dev, "reset",

		ts->reset_gpio = of_get_named_gpio(np, "reset-gpios", 0);

						 GPIOD_OUT_HIGH);

		if (ts->reset_gpio == -EPROBE_DEFER)

	if (IS_ERR(ts->reset_gpio)) {

			return ts->reset_gpio;

		error = PTR_ERR(ts->reset_gpio);

		if (ts->reset_gpio < 0) {

		dev_err(&spi->dev, "error acquiring reset gpio: %d\n", error);

			dev_err(&spi->dev, "error acquiring reset gpio: %d\n",

				ts->reset_gpio);

			return ts->reset_gpio;

		}



		error = devm_gpio_request_one(&spi->dev, ts->reset_gpio, 0,

					      "reset-gpios");

		if (error) {

			dev_err(&spi->dev, "error requesting reset gpio: %d\n",

				error);

		return error;

		return error;

	}

	}





		ts->vio = devm_regulator_get(&spi->dev, "vio");

	ts->vio = devm_regulator_get_optional(&spi->dev, "vio");

	if (IS_ERR(ts->vio)) {

	if (IS_ERR(ts->vio)) {

		error = PTR_ERR(ts->vio);

		error = PTR_ERR(ts->vio);

		dev_err(&spi->dev, "vio regulator missing (%d)", error);

		dev_err(&spi->dev, "vio regulator missing (%d)", error);

		return error;

		return error;

	}

	}

	} else {



		ts->reset_gpio = -1;

	if (!ts->reset_gpio && pdata)

		ts->set_reset = pdata->set_reset;

		ts->set_reset = pdata->set_reset;

	}





	mutex_init(&ts->mutex);

	mutex_init(&ts->mutex);