mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
Input: iqs7222 - configure power mode before triggering ATI
[ Upstream commit2e00b8bf56
] If the device drops into ultra-low-power mode before being placed into normal-power mode as part of ATI being triggered, the device does not assert any interrupts until the ATI routine is restarted two seconds later. Solve this problem by adopting the vendor's recommendation, which calls for the device to be placed into normal-power mode prior to being configured and ATI being triggered. The original implementation followed this sequence, but the order was inadvertently changed as part of the resolution of a separate erratum. Fixes:1e4189d8af
("Input: iqs7222 - protect volatile registers") Signed-off-by: Jeff LaBundy <jeff@labundy.com> Link: https://lore.kernel.org/r/ZKrpHc2Ji9qR25r2@nixie71 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
f20377d4e0
commit
f6fa0e0760
1 changed files with 4 additions and 4 deletions
|
@ -1381,9 +1381,6 @@ static int iqs7222_ati_trigger(struct iqs7222_private *iqs7222)
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
sys_setup &= ~IQS7222_SYS_SETUP_INTF_MODE_MASK;
|
|
||||||
sys_setup &= ~IQS7222_SYS_SETUP_PWR_MODE_MASK;
|
|
||||||
|
|
||||||
for (i = 0; i < IQS7222_NUM_RETRIES; i++) {
|
for (i = 0; i < IQS7222_NUM_RETRIES; i++) {
|
||||||
/*
|
/*
|
||||||
* Trigger ATI from streaming and normal-power modes so that
|
* Trigger ATI from streaming and normal-power modes so that
|
||||||
|
@ -1561,8 +1558,11 @@ static int iqs7222_dev_init(struct iqs7222_private *iqs7222, int dir)
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dir == READ)
|
if (dir == READ) {
|
||||||
|
iqs7222->sys_setup[0] &= ~IQS7222_SYS_SETUP_INTF_MODE_MASK;
|
||||||
|
iqs7222->sys_setup[0] &= ~IQS7222_SYS_SETUP_PWR_MODE_MASK;
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return iqs7222_ati_trigger(iqs7222);
|
return iqs7222_ati_trigger(iqs7222);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue