evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qpnp-smb2: don't stomp over D+/D- during hard reset

Browse source 
Currently when we are in hard reset, the driver requests to remove
the float of D+/D- when VBUS drops and once VBUS is back, it requests
to float D+/D- again. This behaviour ends up stomping over D+/D- lines
leading to noncompliance with PD spec.

Fix it by ensuring we only run the CC2 workaround while VBUS dips
in hard reset.

Change-Id: I2bb9364b890b3a227dd3ea3e0a34a415b600e21a
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
This commit is contained in:
Abhijeet Dharmapurikar 2017-04-24 14:06:54 -07:00
parent eae9df7833
commit 9e2a6b5541
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/power/supply/qcom/smb-lib.c
View file

@ -3152,12 +3152,28 @@ static void smblib_micro_usb_plugin(struct smb_charger *chg, bool vbus_rising)
} }
} }
static void smblib_typec_usb_plugin(struct smb_charger *chg, bool vbus_rising) void smblib_usb_plugin_hard_reset_locked(struct smb_charger *chg)
{ {
int rc;
u8 stat;
bool vbus_rising;
rc = smblib_read(chg, USBIN_BASE + INT_RT_STS_OFFSET, &stat);
if (rc < 0) {
smblib_err(chg, "Couldn't read USB_INT_RT_STS rc=%d\n", rc);
return;
}
vbus_rising = (bool)(stat & USBIN_PLUGIN_RT_STS_BIT);
if (vbus_rising) if (vbus_rising)
smblib_cc2_sink_removal_exit(chg); smblib_cc2_sink_removal_exit(chg);
else else
smblib_cc2_sink_removal_enter(chg); smblib_cc2_sink_removal_enter(chg);
power_supply_changed(chg->usb_psy);
smblib_dbg(chg, PR_INTERRUPT, "IRQ: usbin-plugin %s\n",
vbus_rising ? "attached" : "detached");
} }
#define PL_DELAY_MS 30000 #define PL_DELAY_MS 30000
@ -3216,8 +3232,6 @@ void smblib_usb_plugin_locked(struct smb_charger *chg)
if (chg->micro_usb_mode) if (chg->micro_usb_mode)
smblib_micro_usb_plugin(chg, vbus_rising); smblib_micro_usb_plugin(chg, vbus_rising);
else
smblib_typec_usb_plugin(chg, vbus_rising);
power_supply_changed(chg->usb_psy); power_supply_changed(chg->usb_psy);
smblib_dbg(chg, PR_INTERRUPT, "IRQ: usbin-plugin %s\n", smblib_dbg(chg, PR_INTERRUPT, "IRQ: usbin-plugin %s\n",
@ -3230,7 +3244,10 @@ irqreturn_t smblib_handle_usb_plugin(int irq, void *data)
struct smb_charger *chg = irq_data->parent_data; struct smb_charger *chg = irq_data->parent_data;
mutex_lock(&chg->lock); mutex_lock(&chg->lock);
smblib_usb_plugin_locked(chg); if (chg->pd_hard_reset)
smblib_usb_plugin_hard_reset_locked(chg);
else
smblib_usb_plugin_locked(chg);
mutex_unlock(&chg->lock); mutex_unlock(&chg->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }