From 0a009106438cf5f1ca3bbb432a6098375c40284d Mon Sep 17 00:00:00 2001 From: Ritesh Kumar Date: Fri, 9 Apr 2021 16:55:47 +0530 Subject: [PATCH] Revert "input: touchscreen: nt36xxx: Avoid i2c transfer in LA during TUI" This reverts commit 172ca98496761325509b8834c8a8b867e9d4e6a8. Change-Id: I54886c58803b7ce05abd528414b579d8b0c8cbcf Signed-off-by: Ritesh Kumar --- drivers/input/touchscreen/nt36xxx/nt36xxx.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/input/touchscreen/nt36xxx/nt36xxx.c b/drivers/input/touchscreen/nt36xxx/nt36xxx.c index 5443b6ba4269..7670528c2e38 100644 --- a/drivers/input/touchscreen/nt36xxx/nt36xxx.c +++ b/drivers/input/touchscreen/nt36xxx/nt36xxx.c @@ -2041,14 +2041,6 @@ static irqreturn_t nvt_ts_work_func(int irq, void *data) mutex_lock(&ts->lock); -#ifdef CONFIG_NOVATEK_TRUSTED_TOUCH -#ifndef CONFIG_ARCH_QTI_VM - if (nvt_ts_trusted_touch_get_pvm_driver_state(ts) != - TRUSTED_TOUCH_PVM_INIT) - return IRQ_HANDLED; -#endif -#endif - ret = CTP_I2C_READ(ts->client, I2C_FW_Address, point_data, POINT_DATA_LEN + 1); if (ret < 0) { NVT_ERR("CTP_I2C_READ failed.(%d)\n", ret); @@ -3131,7 +3123,7 @@ static int32_t nvt_ts_resume(struct device *dev) return 0; } -#ifdef CONFIG_NOVATEK_TRUSTED_TOUCH +#ifdef CONFIG_ST_TRUSTED_TOUCH if (atomic_read(&ts->trusted_touch_enabled)) wait_for_completion_interruptible( &ts->trusted_touch_powerdown);