diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
index ece18b9dcb4ca9..553bbece488abb 100644
--- a/arch/arm64/configs/rockchip_linux_defconfig
+++ b/arch/arm64/configs/rockchip_linux_defconfig
@@ -12,7 +12,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=23
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
@@ -65,6 +64,7 @@ CONFIG_ARM_SCPI_CPUFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -1463,8 +1463,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_VCTRL=y
 CONFIG_REGULATOR_VEXPRESS=y
-CONFIG_RC_CORE=y
-CONFIG_BPF_LIRC_MODE2=y
+CONFIG_RC_CORE=m
 CONFIG_LIRC=y
 CONFIG_RC_DECODERS=y
 CONFIG_IR_IMON_DECODER=m
@@ -1498,7 +1497,7 @@ CONFIG_RC_XBOX_DVD=m
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_PWC=m
@@ -1624,17 +1623,14 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_SUN6I_CSI=m
 CONFIG_VIDEO_HANTRO=m
 CONFIG_SMS_SDIO_DRV=m
-CONFIG_VIDEO_IR_I2C=m
 CONFIG_AUXDISPLAY=y
 CONFIG_DRM=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_HDLCD=m
 CONFIG_DRM_MALI_DISPLAY=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_VOP2=y
@@ -1647,7 +1643,6 @@ CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_RGB=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -1686,8 +1681,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_SOUND=y
-CONFIG_SND=y
+CONFIG_SOUND=m
+CONFIG_SND=m
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
@@ -1784,7 +1779,7 @@ CONFIG_SND_USB_POD=m
 CONFIG_SND_USB_PODHD=m
 CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_SOC=y
+CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_ROCKCHIP=m
@@ -1810,8 +1805,8 @@ CONFIG_SND_SOC_ES7241=m
 CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_MAX98927=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=y
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_PCM3168A_I2C=m
 CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RK817=m
@@ -2164,17 +2159,15 @@ CONFIG_MSPRO_BLOCK=m
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
 CONFIG_MEMSTICK_R592=m
-CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_USER=m
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -2241,8 +2234,6 @@ CONFIG_DMA_SUN6I=m
 CONFIG_FSL_EDMA=y
 CONFIG_MV_XOR_V2=y
 CONFIG_PL330_DMA=y
-CONFIG_QCOM_HIDMA_MGMT=y
-CONFIG_QCOM_HIDMA=y
 CONFIG_DW_DMAC=y
 CONFIG_DW_DMAC_PCI=y
 CONFIG_ASYNC_TX_DMA=y
@@ -2424,7 +2415,7 @@ CONFIG_MCP3422=m
 CONFIG_MCP3911=m
 CONFIG_NAU7802=m
 CONFIG_QCOM_SPMI_IADC=m
-CONFIG_QCOM_SPMI_VADC=y
+CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_SD_ADC_MODULATOR=m
@@ -2702,15 +2693,15 @@ CONFIG_OCFS2_FS=m
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=y
+CONFIG_F2FS_FS=m
 CONFIG_F2FS_FS_SECURITY=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QFMT_V2=y
-CONFIG_FUSE_FS=y
-CONFIG_CUSE=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
@@ -2723,8 +2714,9 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_EXFAT_FS=m
-CONFIG_NTFS_FS=y
+CONFIG_NTFS_FS=m
 CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
@@ -2839,6 +2831,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_YAMA=y
 # CONFIG_INTEGRITY is not set
 CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
+CONFIG_LIST_HARDENED=y
 CONFIG_CRYPTO_USER=m
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_PCRYPT=m
@@ -2866,6 +2859,7 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
@@ -2907,18 +2901,15 @@ CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_PRINTK_TIME=y
 CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DYNAMIC_DEBUG=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 # CONFIG_MAGIC_SYSRQ_SERIAL is not set
-CONFIG_KGDB=y
-CONFIG_KGDB_TESTS=y
-CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_PGTABLE=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
-CONFIG_SCHEDSTATS=y
-CONFIG_DEBUG_LIST=y
+# CONFIG_SCHED_DEBUG is not set
 CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set