diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-15 03:44:26 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-15 03:44:26 -0700 |
commit | cbd856e4bd83a49de0c14fce20272099260a4732 (patch) | |
tree | 364393dd171c99c6d22f0155582e852ebb388d52 /drivers/power | |
parent | 427ac22e77bbd4b0834e4a237ac476c005104ddd (diff) | |
parent | e4ef9471ff8ce70199f20d2616b14fe0599508db (diff) |
Merge "qcom-charger: qpnp-smb2: enable some irqs as a wakeup source"
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/qcom-charger/qpnp-smb2.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/power/qcom-charger/qpnp-smb2.c b/drivers/power/qcom-charger/qpnp-smb2.c index 3c934cb0b1f9..542009a03e96 100644 --- a/drivers/power/qcom-charger/qpnp-smb2.c +++ b/drivers/power/qcom-charger/qpnp-smb2.c @@ -605,14 +605,16 @@ static int smb2_determine_initial_status(struct smb2 *chip) **************************/ struct smb2_irq_info { - const char *name; - const irq_handler_t handler; + const char *name; + const irq_handler_t handler; + const bool wake; + int irq; }; -static const struct smb2_irq_info smb2_irqs[] = { +static struct smb2_irq_info smb2_irqs[] = { /* CHARGER IRQs */ { "chg-error", smblib_handle_debug }, - { "chg-state-change", smblib_handle_chg_state_change }, + { "chg-state-change", smblib_handle_chg_state_change, true }, { "step-chg-state-change", smblib_handle_debug }, { "step-chg-soc-update-fail", smblib_handle_debug }, { "step-chg-soc-update-request", smblib_handle_debug }, @@ -633,10 +635,10 @@ static const struct smb2_irq_info smb2_irqs[] = { { "usbin-lt-3p6v", smblib_handle_debug }, { "usbin-uv", smblib_handle_debug }, { "usbin-ov", smblib_handle_debug }, - { "usbin-plugin", smblib_handle_usb_plugin }, - { "usbin-src-change", smblib_handle_usb_source_change }, - { "usbin-icl-change", smblib_handle_icl_change }, - { "type-c-change", smblib_handle_usb_typec_change }, + { "usbin-plugin", smblib_handle_usb_plugin, true }, + { "usbin-src-change", smblib_handle_usb_source_change, true }, + { "usbin-icl-change", smblib_handle_icl_change, true }, + { "type-c-change", smblib_handle_usb_typec_change, true }, /* DC INPUT IRQs */ { "dcin-collapse", smblib_handle_debug }, { "dcin-lt-3p6v", smblib_handle_debug }, @@ -705,6 +707,10 @@ static int smb2_request_interrupt(struct smb2 *chip, return rc; } + smb2_irqs[irq_index].irq = irq; + if (smb2_irqs[irq_index].wake) + enable_irq_wake(irq); + return rc; } |