diff --git a/arch/arm/configs/lineage_matisse3g_defconfig b/arch/arm/configs/lineage_matisse3g_defconfig
index 83ac1839f49..1c6bc4c2669 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 ce84ffb6ca8..64f63970468 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 c73e10e8b54..d4a614f9c46 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 c8bcd7617b4..5f242260c84 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 02ba2a9de13..7c3cd49012a 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 a9a4431dafd..545272001ac 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 c90d9c69d0b..8b76736a9ac 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