A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

power: qpnp-smbcharger-mmi: Fix Factory Kill

Browse source 
Factory Kill was being tripped when USB is suspended.

Fix this by checking USBIN Voltage when in suspend rather
then the online status.

Change-Id: I138db13c0e14b29d887a0dda0dbfdb1d4deffaef
Signed-off-by: Kenny Kessler <kenny.kessler@motorola.com>
Reviewed-on: https://gerrit.mot.com/1206691
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Ryan Lattrel <ryanl@motorola.com>
Reviewed-by: Curtis Porter <porterc@motorola.com>
Reviewed-by: Kenneth Kessler <kennykessler@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Kenny Kessler 2018-07-09 17:10:08 -05:00 • committed by Kenneth Kessler
commit 089a4c52c2
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/power/qpnp-smbcharger-mmi/qpnp-smbcharger-mmi.c
View file

@ -861,6 +861,7 @@ static int smb_mmi_get_property(struct power_supply *psy,
static int factory_kill_disable;
module_param(factory_kill_disable, int, 0644);
#define TWO_VOLT 2000000
static void mmi_heartbeat_work(struct work_struct *work)
{
struct smb_mmi_charger *chip = container_of(work,
@ -868,7 +869,7 @@ static void mmi_heartbeat_work(struct work_struct *work)
heartbeat_work.work);
int hb_resch_time;
union power_supply_propval pval;
int rc;
int rc, usb_suspend, usbin_uv;
if (chip->factory_mode)
hb_resch_time = 1000;
@ -876,13 +877,27 @@ static void mmi_heartbeat_work(struct work_struct *work)
hb_resch_time = 60000;
if (chip->factory_mode) {
rc = smblib_get_usb_suspend(chip, &usb_suspend);
if (rc < 0)
goto sch_hb;
rc = power_supply_get_property(chip->usb_psy,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
&pval);
if (rc < 0)
goto sch_hb;
else
usbin_uv = pval.intval;
rc = power_supply_get_property(chip->pc_port_psy,
POWER_SUPPLY_PROP_ONLINE,
&pval);
if (rc < 0)
goto sch_hb;
if (pval.intval) {
if (pval.intval || (usb_suspend && (usbin_uv > TWO_VOLT))) {
pr_debug("SMBMMI: Factory Kill Armed\n");
chip->factory_kill_armed = true;
} else if (chip->factory_kill_armed && !factory_kill_disable) {
@ -949,14 +964,14 @@ static int smbchg_reboot(struct notifier_block *nb,
/* Suspend USB and DC */
smblib_set_usb_suspend(chg, true);
rc = power_supply_get_property(chg->pc_port_psy,
POWER_SUPPLY_PROP_ONLINE,
rc = power_supply_get_property(chg->usb_psy,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
&val);
while (rc >= 0 && val.intval) {
while ((rc >= 0) && (val.intval > TWO_VOLT)) {
msleep(100);
rc = power_supply_get_property(
chg->pc_port_psy,
POWER_SUPPLY_PROP_ONLINE,
chg->usb_psy,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
&val);
pr_err("Wait for VBUS to decay\n");
}