Merge "input: touchscreen: focaltech: add a new property" (c5680704) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/input/touchscreen/focaltech_touch/focaltech_core.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -2476,6 +2476,9 @@ 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;
		@@ -2903,6 +2906,7 @@ 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) {
		@@ -2934,7 +2938,8 @@ 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) {
		if (!ts_data->ic_info.is_incell && !pdata->power_always_on) {

		#if FTS_POWER_SOURCE_CUST_EN
		ret = fts_power_source_suspend(ts_data);
		if (ret < 0) {
		@@ -2953,6 +2958,7 @@ 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) {
		@@ -2971,6 +2977,7 @@ 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);

+1 −0