qpnp-fg-gen3: disable msoc-full and bsoc-delta IRQs as wakeup sources

msoc-full is not used to determine when the battery is full. The charger
will wakeup the device when it has terminated charging indicating that
the battery is full. Disable the msoc-full IRQ as a wakeup source.

The msoc-delta IRQ is used to wakeup the device when the SOC changes
therefore having the bsoc-delta IRQ as a wakeup source is unnecessary.
Disable the bsoc-delta IRQ as a wakeup source.

Change-Id: Iab7087ce3d6727abc852d3a84590cfa570ec584d
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>

2 files changed, 56 insertions, 17 deletions

diff --git a/drivers/power/qcom-charger/fg-core.h b/drivers/power/qcom-charger/fg-core.h
index 7c6dd45ae412..24ab83565fc9 100644
--- a/drivers/power/qcom-charger/fg-core.h
+++ b/drivers/power/qcom-charger/fg-core.h
@@ -205,8 +205,8 @@ struct fg_cyc_ctr_data {
 struct fg_irq_info {
 	const char		*name;
 	const irq_handler_t	handler;
-	int			irq;
 	bool			wakeable;
+	int			irq;
 };
 
 struct fg_chip {
diff --git a/drivers/power/qcom-charger/qpnp-fg-gen3.c b/drivers/power/qcom-charger/qpnp-fg-gen3.c
index 5545dd17cdd8..ac24ad9486d9 100644
--- a/drivers/power/qcom-charger/qpnp-fg-gen3.c
+++ b/drivers/power/qcom-charger/qpnp-fg-gen3.c
@@ -1460,39 +1460,78 @@ static irqreturn_t fg_dummy_irq_handler(int irq, void *data)
 static struct fg_irq_info fg_irqs[FG_IRQ_MAX] = {
 	/* BATT_SOC irqs */
 	[MSOC_FULL_IRQ] = {
-		"msoc-full", fg_soc_irq_handler, true },
+		.name		= "msoc-full",
+		.handler	= fg_soc_irq_handler,
+	},
 	[MSOC_HIGH_IRQ] = {
-		"msoc-high", fg_soc_irq_handler, true },
+		.name		= "msoc-high",
+		.handler	= fg_soc_irq_handler,
+		.wakeable	= true,
+	},
 	[MSOC_EMPTY_IRQ] = {
-		"msoc-empty", fg_empty_soc_irq_handler, true },
+		.name		= "msoc-empty",
+		.handler	= fg_empty_soc_irq_handler,
+		.wakeable	= true,
+	},
 	[MSOC_LOW_IRQ] = {
-		"msoc-low", fg_soc_irq_handler },
+		.name		= "msoc-low",
+		.handler	= fg_soc_irq_handler,
+		.wakeable	= true,
+	},
 	[MSOC_DELTA_IRQ] = {
-		"msoc-delta", fg_delta_soc_irq_handler, true },
+		.name		= "msoc-delta",
+		.handler	= fg_delta_soc_irq_handler,
+		.wakeable	= true,
+	},
 	[BSOC_DELTA_IRQ] = {
-		"bsoc-delta", fg_delta_soc_irq_handler, true },
+		.name		= "bsoc-delta",
+		.handler	= fg_dummy_irq_handler,
+	},
 	[SOC_READY_IRQ] = {
-		"soc-ready", fg_first_est_irq_handler, true },
+		.name		= "soc-ready",
+		.handler	= fg_first_est_irq_handler,
+		.wakeable	= true,
+	},
 	[SOC_UPDATE_IRQ] = {
-		"soc-update", fg_soc_update_irq_handler },
+		.name		= "soc-update",
+		.handler	= fg_soc_update_irq_handler,
+	},
 	/* BATT_INFO irqs */
 	[BATT_TEMP_DELTA_IRQ] = {
-		"batt-temp-delta", fg_delta_batt_temp_irq_handler },
+		.name		= "batt-temp-delta",
+		.handler	= fg_delta_batt_temp_irq_handler,
+	},
 	[BATT_MISSING_IRQ] = {
-		"batt-missing", fg_batt_missing_irq_handler, true },
+		.name		= "batt-missing",
+		.handler	= fg_batt_missing_irq_handler,
+		.wakeable	= true,
+	},
 	[ESR_DELTA_IRQ] = {
-		"esr-delta", fg_dummy_irq_handler },
+		.name		= "esr-delta",
+		.handler	= fg_dummy_irq_handler,
+	},
 	[VBATT_LOW_IRQ] = {
-		"vbatt-low", fg_vbatt_low_irq_handler, true },
+		.name		= "vbatt-low",
+		.handler	= fg_vbatt_low_irq_handler,
+		.wakeable	= true,
+	},
 	[VBATT_PRED_DELTA_IRQ] = {
-		"vbatt-pred-delta", fg_dummy_irq_handler },
+		.name		= "vbatt-pred-delta",
+		.handler	= fg_dummy_irq_handler,
+	},
 	/* MEM_IF irqs */
 	[DMA_GRANT_IRQ] = {
-		"dma-grant", fg_dummy_irq_handler },
+		.name		= "dma-grant",
+		.handler	= fg_dummy_irq_handler,
+	},
 	[MEM_XCP_IRQ] = {
-		"mem-xcp", fg_dummy_irq_handler },
+		.name		= "mem-xcp",
+		.handler	= fg_dummy_irq_handler,
+	},
 	[IMA_RDY_IRQ] = {
-		"ima-rdy", fg_dummy_irq_handler },
+		.name		= "ima-rdy",
+		.handler	= fg_dummy_irq_handler,
+	},
 };
 
 static int fg_get_irq_index_byname(const char *name)