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

Commit 4729283a authored by Surya Teja Kudiri's avatar Surya Teja Kudiri
Browse files

Revert "input: touchscreen: focaltech: add a new property" 



This reverts commit 32aeb3bf.

Change-Id: I51d7b75897b124e77f593fb03026127a21c66648
Signed-off-by: default avatarFei Mao <feim1@codeaurora.org>
Signed-off-by: default avatarSurya Teja Kudiri <quic_skudiri@quicinc.com>
parent 74cc467c

drivers/input/touchscreen/focaltech_touch/focaltech_core.c

+2 −15
Original line number Diff line number Diff line
@@ -2438,15 +2438,6 @@ static int fts_parse_dt(struct device *dev, struct fts_ts_platform_data *pdata) 
	FTS_INFO("max touch number:%d, irq gpio:%d, reset gpio:%d",

		pdata->max_touch_number, pdata->irq_gpio, pdata->reset_gpio);



	pdata->power_always_on =

			of_property_read_bool(np, "focaltech,power-always-on");



	ret = of_property_read_u32(np, "focaltech,ic-type", &temp_val);

	if (ret < 0)

		pdata->type = _FT3518;

	else

		pdata->type = temp_val;



	FTS_FUNC_EXIT();

	return 0;

}
@@ -2869,7 +2860,6 @@ static int fts_ts_suspend(struct device *dev) 
{

	int ret = 0;

	struct fts_ts_data *ts_data = fts_data;

	struct fts_ts_platform_data *pdata = ts_data->pdata;



	FTS_FUNC_ENTER();

	if (ts_data->suspended) {
@@ -2901,8 +2891,7 @@ static int fts_ts_suspend(struct device *dev) 
		if (ret < 0)

			FTS_ERROR("set TP to sleep mode fail, ret=%d", ret);



		if (!ts_data->ic_info.is_incell && !pdata->power_always_on) {



		if (!ts_data->ic_info.is_incell) {

#if FTS_POWER_SOURCE_CUST_EN

			ret = fts_power_source_suspend(ts_data);

			if (ret < 0) {
@@ -2921,7 +2910,6 @@ static int fts_ts_suspend(struct device *dev) 
static int fts_ts_resume(struct device *dev)

{

	struct fts_ts_data *ts_data = fts_data;

	struct fts_ts_platform_data *pdata = ts_data->pdata;



	FTS_FUNC_ENTER();

	if (!ts_data->suspended) {
@@ -2933,7 +2921,6 @@ static int fts_ts_resume(struct device *dev) 


	if (!ts_data->ic_info.is_incell) {

#if FTS_POWER_SOURCE_CUST_EN

		if (!pdata->power_always_on)

		fts_power_source_resume(ts_data);

#endif

		fts_reset_proc(200);

drivers/input/touchscreen/focaltech_touch/focaltech_core.h

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ struct fts_ts_platform_data { 
	u32 x_min;

	u32 y_min;

	u32 max_touch_number;

	bool power_always_on;

};



struct ts_event {