diff --git a/arch/riscv/configs/rvck_defconfig b/arch/riscv/configs/rvck_defconfig
index 7958664d3b0c..1fe60658bf03 100644
--- a/arch/riscv/configs/rvck_defconfig
+++ b/arch/riscv/configs/rvck_defconfig
@@ -78,7 +78,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=m
-CONFIG_RISCV_XUANTIE_TH1520_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_ACPI=y
@@ -86,10 +85,10 @@ CONFIG_ACPI_TAD=m
 CONFIG_ACPI_NFIT=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_EINJ=y
-CONFIG_ACPI_APEI_ERST_DEBUG=y
 CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=y
+CONFIG_ACPI_APEI_ERST_DEBUG=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_COMPAT_32BIT_TIME is not set
@@ -97,7 +96,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SIG_SHA256=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
@@ -635,6 +633,7 @@ CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_CONNECTOR=y
 CONFIG_ISCSI_IBFT=m
+CONFIG_TH1520_AON_PROTOCOL=y
 CONFIG_GOOGLE_FIRMWARE=y
 CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_MEMCONSOLE_COREBOOT=m
@@ -642,8 +641,6 @@ CONFIG_GOOGLE_VPD=m
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_RESET_ATTACK_MITIGATION=y
-CONFIG_TH1520_AON_PROTOCOL=y
-CONFIG_TH1520_PM_DOMAINS=y
 CONFIG_GNSS=m
 CONFIG_GNSS_SIRF_SERIAL=m
 CONFIG_GNSS_UBX_SERIAL=m
@@ -1817,13 +1814,6 @@ CONFIG_SND_FIREFACE=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_STARFIVE=m
 CONFIG_SND_SOC_JH7110_TDM=m
-CONFIG_SND_SOC_XUANTIE=m
-CONFIG_SND_SOC_XUANTIE_TH1520_I2S=m
-CONFIG_SND_SOC_XUANTIE_TH1520_I2S_CH8=m
-CONFIG_SND_SOC_XUANTIE_TH1520_HDMI_PCM=m
-CONFIG_SND_SOC_XUANTIE_TH1520_TDM=m
-CONFIG_SND_SOC_XUANTIE_TH1520_SPDIF=m
-CONFIG_RK_HEADSET=m
 CONFIG_SND_SOC_AW87519=m
 CONFIG_SND_SOC_ES7210=m
 CONFIG_SND_SOC_ES8156=m
@@ -2173,10 +2163,10 @@ CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_SD3078=m
 CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_XGENE=m
 CONFIG_RTC_DRV_POLARFIRE_SOC=m
-CONFIG_RTC_DRV_EFI=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_SUN6I=m
 CONFIG_DW_AXI_DMAC=m
@@ -2189,6 +2179,10 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 CONFIG_UIO_MF624=m
+CONFIG_VFIO=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI=m
+CONFIG_MLX5_VFIO_PCI=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_VDPA=m
@@ -2215,13 +2209,13 @@ CONFIG_POLARFIRE_SOC_MAILBOX=m
 CONFIG_SUN50I_IOMMU=y
 CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_CTRL=m
-CONFIG_RPMSG_TH1520=y
 CONFIG_RPMSG_VIRTIO=y
 CONFIG_SOUNDWIRE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUNDWIRE_QCOM=m
 CONFIG_POLARFIRE_SOC_SYS_CTRL=m
 CONFIG_SPACEMIT_MEM_RANGE=y
+CONFIG_TH1520_PM_DOMAINS=y
 CONFIG_MEMORY=y
 CONFIG_ADIS16201=m
 CONFIG_ADIS16209=m