diff --git a/arch/arm/configs/lineage_matisse3g_defconfig b/arch/arm/configs/lineage_matisse3g_defconfig
index 712d734eb6d..639ada5c218 100644
--- a/arch/arm/configs/lineage_matisse3g_defconfig
+++ b/arch/arm/configs/lineage_matisse3g_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y
@@ -2518,7 +2518,7 @@ CONFIG_IR_LIRC_CODEC=y
 #
 # CONFIG_MSM_CAMERA is not set
 CONFIG_MSMB_CAMERA=y
-CONFIG_MSMB_CAMERA_DEBUG=y
+# CONFIG_MSMB_CAMERA_DEBUG is not set
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CPP=y
 CONFIG_MSM_CCI=y
diff --git a/arch/arm/configs/lineage_matisselte_defconfig b/arch/arm/configs/lineage_matisselte_defconfig
index 3bdf8215a6b..50c56c3e6a7 100644
--- a/arch/arm/configs/lineage_matisselte_defconfig
+++ b/arch/arm/configs/lineage_matisselte_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y
@@ -2518,7 +2518,7 @@ CONFIG_IR_LIRC_CODEC=y
 #
 # CONFIG_MSM_CAMERA is not set
 CONFIG_MSMB_CAMERA=y
-CONFIG_MSMB_CAMERA_DEBUG=y
+# CONFIG_MSMB_CAMERA_DEBUG is not set
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CPP=y
 CONFIG_MSM_CCI=y
diff --git a/arch/arm/configs/lineage_matissewifi_defconfig b/arch/arm/configs/lineage_matissewifi_defconfig
index f2fbed9fcf9..2bf8aed9a7d 100644
--- a/arch/arm/configs/lineage_matissewifi_defconfig
+++ b/arch/arm/configs/lineage_matissewifi_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y
@@ -2518,7 +2518,7 @@ CONFIG_IR_LIRC_CODEC=y
 #
 # CONFIG_MSM_CAMERA is not set
 CONFIG_MSMB_CAMERA=y
-CONFIG_MSMB_CAMERA_DEBUG=y
+# CONFIG_MSMB_CAMERA_DEBUG is not set
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CPP=y
 CONFIG_MSM_CCI=y
diff --git a/arch/arm/configs/lineage_millet3g_defconfig b/arch/arm/configs/lineage_millet3g_defconfig
index 5113f2d0fcf..1a8c4b306cc 100644
--- a/arch/arm/configs/lineage_millet3g_defconfig
+++ b/arch/arm/configs/lineage_millet3g_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y
diff --git a/arch/arm/configs/lineage_milletlte_defconfig b/arch/arm/configs/lineage_milletlte_defconfig
index d7ba84e5296..2cf9d9fe03c 100644
--- a/arch/arm/configs/lineage_milletlte_defconfig
+++ b/arch/arm/configs/lineage_milletlte_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y
diff --git a/arch/arm/configs/lineage_milletltetmo_defconfig b/arch/arm/configs/lineage_milletltetmo_defconfig
index b6d9df2e15e..bc3b4c7c113 100644
--- a/arch/arm/configs/lineage_milletltetmo_defconfig
+++ b/arch/arm/configs/lineage_milletltetmo_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y
diff --git a/arch/arm/configs/lineage_milletwifi_defconfig b/arch/arm/configs/lineage_milletwifi_defconfig
index e3947da8c29..8ed18c509ef 100644
--- a/arch/arm/configs/lineage_milletwifi_defconfig
+++ b/arch/arm/configs/lineage_milletwifi_defconfig
@@ -669,9 +669,9 @@ CONFIG_MSM_N_WAY_SMD=y
 CONFIG_MSM_N_WAY_SMSM=y
 CONFIG_MSM_SMP2P=y
 CONFIG_MSM_SMP2P_TEST=y
-CONFIG_MSM_RESET_MODEM=y
-CONFIG_MSM_SMD_LOGGING=y
-CONFIG_MSM_IPC_LOGGING=y
+# CONFIG_MSM_RESET_MODEM is not set
+# CONFIG_MSM_SMD_LOGGING is not set
+# CONFIG_MSM_IPC_LOGGING is not set
 CONFIG_MSM_SMD_NMEA=y
 CONFIG_MSM_SMD_TTY=y
 CONFIG_MSM_SMD_QMI=y
@@ -723,8 +723,8 @@ CONFIG_MSM_PIL_PRONTO=y
 CONFIG_MSM_SCM=y
 # CONFIG_MSM_BUSPM_DEV is not set
 # CONFIG_MSM_TZ_LOG is not set
-CONFIG_MSM_RPM_LOG=y
-CONFIG_MSM_RPM_STATS_LOG=y
+# CONFIG_MSM_RPM_LOG is not set
+# CONFIG_MSM_RPM_STATS_LOG is not set
 # CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG is not set
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_IOMMU_API=y