diff --git a/common/pmu_tps65090.c b/common/pmu_tps65090.c
index eb8c5ed3a5..b1d0b2fbe0 100644
--- a/common/pmu_tps65090.c
+++ b/common/pmu_tps65090.c
@@ -475,15 +475,6 @@ int pmu_adc_read(int adc_idx, int flags)
 	return (val2 << 8) | val1;
 }
 
-void pmu_irq_handler(enum gpio_signal signal)
-{
-#ifdef CONFIG_AC_POWER_STATUS
-	gpio_set_level(GPIO_AC_STATUS, extpower_is_present());
-#endif
-	pmu_task_throttled_wake();
-	CPRINTF("Charger IRQ received.\n");
-}
-
 /**
  * Attempt shutdown.
  */
diff --git a/common/pmu_tps65090_charger.c b/common/pmu_tps65090_charger.c
index 15bcbbd760..0d73fcc619 100644
--- a/common/pmu_tps65090_charger.c
+++ b/common/pmu_tps65090_charger.c
@@ -535,3 +535,13 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, pmu_chipset_events, HOOK_PRIO_DEFAULT);
 DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, pmu_chipset_events, HOOK_PRIO_DEFAULT);
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, pmu_chipset_events, HOOK_PRIO_DEFAULT);
 DECLARE_HOOK(HOOK_CHIPSET_RESUME, pmu_chipset_events, HOOK_PRIO_DEFAULT);
+
+void pmu_irq_handler(enum gpio_signal signal)
+{
+#ifdef CONFIG_AC_POWER_STATUS
+	gpio_set_level(GPIO_AC_STATUS, extpower_is_present());
+#endif
+	pmu_task_throttled_wake();
+	CPRINTF("Charger IRQ received.\n");
+}
+
diff --git a/include/pmu_tpschrome.h b/include/pmu_tpschrome.h
index bc348c7042..deb23f79c2 100644
--- a/include/pmu_tpschrome.h
+++ b/include/pmu_tpschrome.h
@@ -197,12 +197,16 @@ int pmu_low_current_charging(int enable);
  */
 int pmu_adc_read(int adc_idx, int flags);
 
+#ifdef HAS_TASK_CHARGER
 /**
- * Handles interrupts from tpschrome
+ * Handles charger interrupts from tpschrome
  *
  * @param signal         Indicates signal type.
  */
 void pmu_irq_handler(enum gpio_signal signal);
+#else
+#define pmu_irq_handler NULL
+#endif
 
 /**
  * Set temperature threshold