diff --git a/drivers/power/mmi-smbcharger-iio/Kconfig b/drivers/power/mmi-smbcharger-iio/Kconfig
index 55a12c49055e..7edb5b669112 100644
--- a/drivers/power/mmi-smbcharger-iio/Kconfig
+++ b/drivers/power/mmi-smbcharger-iio/Kconfig
@@ -7,3 +7,11 @@ config MMI_SMBCHARGER_IIO
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called mmi-smbcharger-iio.
+
+config QG_LEGACY
+	bool "Legacy behavior for QG fuel gauge (disable SOH)"
+	depends on MMI_SMBCHARGER_IIO
+	default n
+	help
+	  Says Y if you want to disable QG SOH channel and use legacy
+	  battery detection path.
diff --git a/drivers/power/supply/qcom/qpnp-qg.c b/drivers/power/supply/qcom/qpnp-qg.c
index c64e8e0f322d..13695b92cede 100644
--- a/drivers/power/supply/qcom/qpnp-qg.c
+++ b/drivers/power/supply/qcom/qpnp-qg.c
@@ -4815,7 +4815,7 @@ static int qpnp_qg_probe(struct platform_device *pdev)
 	chip->sys_soc = INT_MIN;
 	chip->full_soc = QG_SOC_FULL;
 	chip->chg_iterm_ma = INT_MIN;
-#ifdef CONFIG_DENVER_DTB
+#ifdef CONFIG_QG_LEGACY
 	chip->soh = -EINVAL;
 #else
 	chip->soh = 100;
diff --git a/drivers/power/supply/qcom/smb5-iio.h b/drivers/power/supply/qcom/smb5-iio.h
index 5ccab9901744..b3c301373e57 100644
--- a/drivers/power/supply/qcom/smb5-iio.h
+++ b/drivers/power/supply/qcom/smb5-iio.h
@@ -33,7 +33,7 @@ enum qg_chg_iio_channels {
 	SMB5_QG_CYCLE_COUNT,
 	SMB5_QG_CHARGE_FULL_DESIGN,
 	SMB5_QG_TIME_TO_FULL_NOW,
-#ifndef CONFIG_DENVER_DTB
+#ifndef CONFIG_QG_LEGACY
 	SMB5_QG_SOH,
 #endif
 };
diff --git a/drivers/power/supply/qcom/smb5-lib.c b/drivers/power/supply/qcom/smb5-lib.c
index ce1b16d37b34..10d31d446581 100644
--- a/drivers/power/supply/qcom/smb5-lib.c
+++ b/drivers/power/supply/qcom/smb5-lib.c
@@ -915,7 +915,7 @@ static const char * const smblib_qg_ext_iio_chan[] = {
 	[SMB5_QG_CYCLE_COUNT] = "cycle_count",
 	[SMB5_QG_CHARGE_FULL_DESIGN] = "charge_full_design",
 	[SMB5_QG_TIME_TO_FULL_NOW] = "time_to_full_now",
-#ifndef CONFIG_DENVER_DTB
+#ifndef CONFIG_QG_LEGACY
 	[SMB5_QG_SOH] = "soh",
 #endif
 };