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

Merge "qcom: qpnp-smb2: Reset switcher_power_ok irq count when USBIN_UV fires"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-11 01:25:25 -08:00 • committed by Gerrit - the friendly Code Review server
commit befaaa3795
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/power/supply/qcom/qpnp-smb2.c
View file

@ -1746,7 +1746,7 @@ static struct smb_irq_info smb2_irqs[] = {
},
[USBIN_UV_IRQ] = {
.name = "usbin-uv",
.handler = smblib_handle_debug,
.handler = smblib_handle_usbin_uv,
},
[USBIN_OV_IRQ] = {
.name = "usbin-ov",

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

@ -2801,6 +2801,21 @@ irqreturn_t smblib_handle_usb_psy_changed(int irq, void *data)
return IRQ_HANDLED;
}
irqreturn_t smblib_handle_usbin_uv(int irq, void *data)
{
struct smb_irq_data *irq_data = data;
struct smb_charger *chg = irq_data->parent_data;
struct storm_watch *wdata;
smblib_dbg(chg, PR_INTERRUPT, "IRQ: %s\n", irq_data->name);
if (!chg->irq_info[SWITCH_POWER_OK_IRQ].irq_data)
return IRQ_HANDLED;
wdata = &chg->irq_info[SWITCH_POWER_OK_IRQ].irq_data->storm_data;
reset_storm_count(wdata);
return IRQ_HANDLED;
}
irqreturn_t smblib_handle_usb_plugin(int irq, void *data)
{
struct smb_irq_data *irq_data = data;

1
drivers/power/supply/qcom/smb-lib.h
View file

@ -357,6 +357,7 @@ irqreturn_t smblib_handle_step_chg_soc_update_request(int irq, void *data);
irqreturn_t smblib_handle_batt_temp_changed(int irq, void *data);
irqreturn_t smblib_handle_batt_psy_changed(int irq, void *data);
irqreturn_t smblib_handle_usb_psy_changed(int irq, void *data);
irqreturn_t smblib_handle_usbin_uv(int irq, void *data);
irqreturn_t smblib_handle_usb_plugin(int irq, void *data);
irqreturn_t smblib_handle_usb_source_change(int irq, void *data);
irqreturn_t smblib_handle_icl_change(int irq, void *data);