diff --git a/arch/arm64/configs/a53x-ksu_defconfig b/arch/arm64/configs/a53x-ksu_defconfig
index 6d51dfb36..9f1f204a6 100644
--- a/arch/arm64/configs/a53x-ksu_defconfig
+++ b/arch/arm64/configs/a53x-ksu_defconfig
@@ -556,10 +556,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_ADVANCED_DEBUG is not set
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -5483,7 +5479,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_EDAC_SUPPORT is not set
+CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -5677,7 +5673,6 @@ CONFIG_UIO=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_PMEM is not set
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
@@ -6010,6 +6005,7 @@ CONFIG_CMUCAL=m
 CONFIG_CP_PMUCAL=m
 CONFIG_GNSS_PMUCAL=m
 CONFIG_CHUB_PMUCAL=m
+CONFIG_CMUCAL_DEBUG=m
 CONFIG_CMUCAL_QCH_IGNORE_SUPPORT=m
 CONFIG_PMUCAL=y
 # CONFIG_PMUCAL_DBG is not set
@@ -6073,6 +6069,7 @@ CONFIG_EXYNOS_ACPM_MFD=y
 # CONFIG_EXYNOS_MFD_SPMI is not set
 CONFIG_EXYNOS_MFD_I3C=y
 # CONFIG_EXYNOS_ACPM_S2D is not set
+# CONFIG_EXYNOS_ACPM_PLGDBG is not set
 CONFIG_EXYNOS_DEBUG=y
 CONFIG_DEBUG_SNAPSHOT=m
 # CONFIG_DEBUG_SNAPSHOT_API is not set
@@ -6695,13 +6692,6 @@ CONFIG_ANDROID_VENDOR_OEM_DATA=y
 
 CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
-CONFIG_BLK_DEV_PMEM=y
-# CONFIG_ND_BLK is not set
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=y
-CONFIG_BTT=y
-CONFIG_OF_PMEM=y
-CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 # CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
@@ -7857,7 +7847,6 @@ CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_COMPAT_VDSO=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_SG_POOL=y
-CONFIG_MEMREGION=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_STACK_HASH_ORDER=12
@@ -7923,8 +7912,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
-CONFIG_CC_HAS_UBSAN_BOUNDS=y
-CONFIG_CC_HAS_UBSAN_ARRAY_BOUNDS=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
@@ -8090,7 +8077,6 @@ CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_TRACING_MAP=y
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_HIST_TRIGGERS is not set
 # CONFIG_TRACE_EVENT_INJECT is not set
@@ -8101,7 +8087,6 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
-# CONFIG_HIST_TRIGGERS_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
diff --git a/arch/arm64/configs/a53x_defconfig b/arch/arm64/configs/a53x_defconfig
index 5b3d941d4..f0d1e61b7 100644
--- a/arch/arm64/configs/a53x_defconfig
+++ b/arch/arm64/configs/a53x_defconfig
@@ -556,10 +556,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_ADVANCED_DEBUG is not set
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -3008,7 +3004,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_NOZOMI is not set
 # CONFIG_NULL_TTY is not set
 # CONFIG_TRACE_SINK is not set
-# CONFIG_HVC_DRIVER is not set
+CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -5483,12 +5479,8 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_EDAC_SUPPORT is not set
+CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDAC is not set
-# CONFIG_EDAC_DEBUG is not set
-# CONFIG_EDAC_THUNDERX is not set
-# CONFIG_EDAC_XGENE is not set
-# CONFIG_EDAC_DMC520 is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -5681,7 +5673,6 @@ CONFIG_UIO=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_PMEM is not set
 # CONFIG_VIRTIO_BALLOON is not set
 # CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
@@ -6014,6 +6005,7 @@ CONFIG_CMUCAL=m
 CONFIG_CP_PMUCAL=m
 CONFIG_GNSS_PMUCAL=m
 CONFIG_CHUB_PMUCAL=m
+CONFIG_CMUCAL_DEBUG=m
 CONFIG_CMUCAL_QCH_IGNORE_SUPPORT=m
 CONFIG_PMUCAL=y
 # CONFIG_PMUCAL_DBG is not set
@@ -6077,6 +6069,7 @@ CONFIG_EXYNOS_ACPM_MFD=y
 # CONFIG_EXYNOS_MFD_SPMI is not set
 CONFIG_EXYNOS_MFD_I3C=y
 # CONFIG_EXYNOS_ACPM_S2D is not set
+# CONFIG_EXYNOS_ACPM_PLGDBG is not set
 CONFIG_EXYNOS_DEBUG=y
 CONFIG_DEBUG_SNAPSHOT=m
 # CONFIG_DEBUG_SNAPSHOT_API is not set
@@ -6699,13 +6692,6 @@ CONFIG_ANDROID_VENDOR_OEM_DATA=y
 
 CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
-CONFIG_BLK_DEV_PMEM=y
-# CONFIG_ND_BLK is not set
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=y
-CONFIG_BTT=y
-CONFIG_OF_PMEM=y
-CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 # CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
@@ -7843,7 +7829,6 @@ CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_COMPAT_VDSO=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_SG_POOL=y
-CONFIG_MEMREGION=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_STACK_HASH_ORDER=12
@@ -7909,8 +7894,6 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
-CONFIG_CC_HAS_UBSAN_BOUNDS=y
-CONFIG_CC_HAS_UBSAN_ARRAY_BOUNDS=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
@@ -8076,7 +8059,6 @@ CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_TRACING_MAP=y
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_HIST_TRIGGERS is not set
 # CONFIG_TRACE_EVENT_INJECT is not set
@@ -8087,7 +8069,6 @@ CONFIG_SYNTH_EVENTS=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
-# CONFIG_HIST_TRIGGERS_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set