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

Commit 27cef8b4 authored by Heiko Stübner's avatar Heiko Stübner Committed by Dmitry Torokhov
Browse files

Input: auo-pixcir-ts - handle reset gpio directly 



Devicetree based platforms don't handle device callbacks very well
and until now no board has come along that needs more extended hwinit
than pulling the rst gpio high.

Therefore pull the reset handling directly into the driver and remove
the callbacks from the driver.

If extended device setup is needed at some later point, power-sequences
would probably be the solution of choice.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent fa656308

drivers/input/touchscreen/auo-pixcir-ts.c

+20 −6
Original line number Diff line number Diff line
@@ -511,8 +511,21 @@ static int auo_pixcir_probe(struct i2c_client *client, 
		goto err_gpio_dir;

	}



	if (pdata->init_hw)

		pdata->init_hw(client);

	ret = gpio_request(pdata->gpio_rst, "auo_pixcir_ts_rst");

	if (ret) {

		dev_err(&client->dev, "request of gpio %d failed, %d\n",

			pdata->gpio_rst, ret);

		goto err_gpio_dir;

	}



	ret = gpio_direction_output(pdata->gpio_rst, 1);

	if (ret) {

		dev_err(&client->dev, "setting direction of gpio %d failed %d\n",

			pdata->gpio_rst, ret);

		goto err_gpio_rst;

	}



	msleep(200);



	ts->client = client;

	ts->touch_ind_mode = 0;
@@ -597,8 +610,9 @@ static int auo_pixcir_probe(struct i2c_client *client, 
err_fw_vers:

	input_free_device(input_dev);

err_input_alloc:

	if (pdata->exit_hw)

		pdata->exit_hw(client);

	gpio_set_value(pdata->gpio_rst, 0);

err_gpio_rst:

	gpio_free(pdata->gpio_rst);

err_gpio_dir:

	gpio_free(pdata->gpio_int);

err_gpio_int:
@@ -616,8 +630,8 @@ static int auo_pixcir_remove(struct i2c_client *client) 


	input_unregister_device(ts->input);



	if (pdata->exit_hw)

		pdata->exit_hw(client);

	gpio_set_value(pdata->gpio_rst, 0);

	gpio_free(pdata->gpio_rst);



	gpio_free(pdata->gpio_int);

include/linux/input/auo-pixcir-ts.h

+1 −3
Original line number Diff line number Diff line
@@ -43,12 +43,10 @@ 
 */

struct auo_pixcir_ts_platdata {

	int gpio_int;

	int gpio_rst;



	int int_setting;



	void (*init_hw)(struct i2c_client *);

	void (*exit_hw)(struct i2c_client *);



	unsigned int x_max;

	unsigned int y_max;

};