summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-18 23:48:39 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-18 23:48:39 -0800
commitb2c6447f46207afe85b3439d273f7eea17c2ef11 (patch)
tree14d3b1eeb86e033cf2e0baaedbc766a2a985e4be /drivers/usb
parentfbbaeb656aa52d5a18e947c5b3611ff849f363d1 (diff)
parent77629c3ba6f2528c4d9aab43c1f5daa04f485f0a (diff)
Merge "usb: pd: pdphy: Enable IRQs for wakeup"
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/pd/qpnp-pdphy.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/pd/qpnp-pdphy.c b/drivers/usb/pd/qpnp-pdphy.c
index 1a03b0d71a18..4ecc24c6be11 100644
--- a/drivers/usb/pd/qpnp-pdphy.c
+++ b/drivers/usb/pd/qpnp-pdphy.c
@@ -244,9 +244,12 @@ void pdphy_enable_irq(struct usb_pdphy *pdphy, bool enable)
if (enable) {
enable_irq(pdphy->sig_tx_irq);
enable_irq(pdphy->sig_rx_irq);
+ enable_irq_wake(pdphy->sig_rx_irq);
enable_irq(pdphy->msg_tx_irq);
- if (!pdphy->in_test_data_mode)
+ if (!pdphy->in_test_data_mode) {
enable_irq(pdphy->msg_rx_irq);
+ enable_irq_wake(pdphy->msg_rx_irq);
+ }
enable_irq(pdphy->msg_tx_failed_irq);
enable_irq(pdphy->msg_tx_discarded_irq);
enable_irq(pdphy->msg_rx_discarded_irq);
@@ -255,9 +258,12 @@ void pdphy_enable_irq(struct usb_pdphy *pdphy, bool enable)
disable_irq(pdphy->sig_tx_irq);
disable_irq(pdphy->sig_rx_irq);
+ disable_irq_wake(pdphy->sig_rx_irq);
disable_irq(pdphy->msg_tx_irq);
- if (!pdphy->in_test_data_mode)
+ if (!pdphy->in_test_data_mode) {
disable_irq(pdphy->msg_rx_irq);
+ disable_irq_wake(pdphy->msg_rx_irq);
+ }
disable_irq(pdphy->msg_tx_failed_irq);
disable_irq(pdphy->msg_tx_discarded_irq);
disable_irq(pdphy->msg_rx_discarded_irq);