commit 4a8499adde766d71a890c6303a903ee5b28f743c
author Linux Build Service Account <lnxbuild@localhost> Sun Sep 16 20:45:17 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Sep 16 20:45:15 2012 -0700
tree ee66046390841debe0e52d1738e3feb7b8d62f3b
parent 11f07b71de2df6ae6aa98fdbe036b6a112daa355
parent 0e886b44ddd2f84770044712151d25a79a5612ef

Merge "msm: power-on: Configure the PON IRQs to support wakeup"

drivers/platform/msm/qpnp-power-on.c

diff --git a/drivers/platform/msm/qpnp-power-on.c b/drivers/platform/msm/qpnp-power-on.c
index 0119ebe..996456f 100644
--- a/drivers/platform/msm/qpnp-power-on.c
+++ b/drivers/platform/msm/qpnp-power-on.c
@@ -435,6 +435,14 @@
 		return -EINVAL;
 	}
 
+	/* mark the interrupts wakeable if they support linux-key */
+	if (cfg->key_code) {
+		enable_irq_wake(cfg->state_irq);
+		/* special handling for RESIN due to a hardware bug */
+		if (cfg->pon_type == PON_RESIN && cfg->support_reset)
+			enable_irq_wake(cfg->bark_irq);
+	}
+
 	return rc;
 }