Merge "input: touchscreen: nt36xxx: Skip i2c tx during tui suspend"

This commit is contained in:
qctecmdr 2021-05-18 02:41:35 -07:00 committed by Gerrit - the friendly Code Review server
commit bebc15ab65

View File

@ -3086,10 +3086,6 @@ static int32_t nvt_ts_suspend(struct device *dev)
} }
#ifdef CONFIG_NOVATEK_TRUSTED_TOUCH #ifdef CONFIG_NOVATEK_TRUSTED_TOUCH
if (atomic_read(&ts->trusted_touch_underway))
wait_for_completion_interruptible(
&ts->trusted_touch_powerdown);
atomic_set(&ts->suspend_resume_underway, 1); atomic_set(&ts->suspend_resume_underway, 1);
reinit_completion(&ts->touch_suspend_resume); reinit_completion(&ts->touch_suspend_resume);
#endif #endif
@ -3124,7 +3120,10 @@ static int32_t nvt_ts_suspend(struct device *dev)
//---write command to enter "deep sleep mode"--- //---write command to enter "deep sleep mode"---
buf[0] = EVENT_MAP_HOST_CMD; buf[0] = EVENT_MAP_HOST_CMD;
buf[1] = 0x11; buf[1] = 0x11;
CTP_I2C_WRITE(ts->client, I2C_FW_Address, buf, 2); #ifdef CONFIG_NOVATEK_TRUSTED_TOUCH
if (!atomic_read(&ts->trusted_touch_underway))
CTP_I2C_WRITE(ts->client, I2C_FW_Address, buf, 2);
#endif
#endif // WAKEUP_GESTURE #endif // WAKEUP_GESTURE
mutex_unlock(&ts->lock); mutex_unlock(&ts->lock);