diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index 41e0066..719bfa8 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -27,8 +27,7 @@
 #include <mach/usb.h>
 #include <asm/mmu.h>
 #include <asm/cache-l2x0.h>
-
-#include <poweroff.h>
+#include <mfd/pfuze.h>
 
 #define CLPCR				0x54
 #define BP_CLPCR_LPM(mode)		((mode) & 0x3)
@@ -195,6 +194,11 @@
 	return imx_ocotp_read_uid(IOMEM(MX6_OCOTP_BASE_ADDR));
 }
 
+static void imx6_register_poweroff_init(struct regmap *map)
+{
+	poweroff_handler_register_fn(imx6_pm_stby_poweroff);
+}
+
 int imx6_init(void)
 {
 	const char *cputypestr;
@@ -252,6 +256,8 @@
 	imx6_setup_ipu_qos();
 	imx6ul_enet_clk_init();
 
+	pfuze_register_init_callback(imx6_register_poweroff_init);
+
 	return 0;
 }
 
@@ -366,7 +372,7 @@
 }
 device_initcall(imx6_fixup_cpus_register);
 
-void __noreturn imx6_pm_stby_poweroff(void)
+void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler)
 {
 	void *ccm_base = IOMEM(MX6_CCM_BASE_ADDR);
 	void *gpc_base = IOMEM(MX6_GPC_BASE_ADDR);
diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h
index f0d2083..5560774 100644
--- a/arch/arm/mach-imx/include/mach/imx6.h
+++ b/arch/arm/mach-imx/include/mach/imx6.h
@@ -6,7 +6,9 @@
 #include <mach/imx6-regs.h>
 #include <mach/revision.h>
 
-void __noreturn imx6_pm_stby_poweroff(void);
+#include <poweroff.h>
+
+void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler);
 
 #define IMX6_ANATOP_SI_REV 0x260
 #define IMX6SL_ANATOP_SI_REV 0x280
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 28bd69a..f47a115 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -19,7 +19,7 @@
 config REGULATOR_PFUZE
 	bool "Freescale PFUZE100/200/3000 regulator driver"
 	depends on I2C
-	depends on ARCH_IMX6
+	depends on ARCH_IMX6 || ARCH_IMX8MQ
 
 config REGULATOR_STPMIC1
 	tristate "STMicroelectronics STPMIC1 PMIC Regulators"
diff --git a/drivers/regulator/pfuze.c b/drivers/regulator/pfuze.c
index 55f7eb5..91aaec0 100644
--- a/drivers/regulator/pfuze.c
+++ b/drivers/regulator/pfuze.c
@@ -142,8 +142,6 @@
 	regmap_write_bits(pfuze_dev->map, PFUZE100_VGEN6VOL,
 			  PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
 			  PFUZE100_VGENxSTBY);
-
-	imx6_pm_stby_poweroff();
 }
 
 static struct regmap_bus regmap_pfuze_i2c_bus = {
diff --git a/include/mfd/pfuze.h b/include/mfd/pfuze.h
index 6045cee..8e02168 100644
--- a/include/mfd/pfuze.h
+++ b/include/mfd/pfuze.h
@@ -1,6 +1,22 @@
 #ifndef __INCLUDE_PFUZE_H
 #define __INCLUDE_PFUZE_H
 
+#include <regmap.h>
+
+#ifdef CONFIG_REGULATOR_PFUZE
+/*
+ * For proper poweroff sequencing, users on imx6 needs to call
+ * poweroff_handler_register_fn(imx6_pm_stby_poweroff);
+ * inside of the callback, to ensure a proper poweroff sequence
+ */
 int pfuze_register_init_callback(void(*callback)(struct regmap *map));
 
+#else
+
+static inline int pfuze_register_init_callback(void(*callback)(struct regmap *map))
+{
+	return -ENODEV;
+}
+#endif
+
 #endif /* __INCLUDE_PFUZE_H */