diff --git a/config-aarch64 b/config-aarch64
index b393f11..09c66e2 100644
--- a/config-aarch64
+++ b/config-aarch64
@@ -369,7 +369,7 @@ CONFIG_ARCH_MXC=y
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_ROCKCHIP is not set
+CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SEATTLE=y
 # CONFIG_ARCH_INTEL_SOCFPGA is not set
 # CONFIG_ARCH_STM32 is not set
@@ -2147,6 +2147,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_MICROCHIP_HOST=y
 CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_PCI_TEGRA=y
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
 CONFIG_PCIE_XILINX=y
@@ -2183,6 +2184,7 @@ CONFIG_PCIE_TEGRA194_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCIE_QCOM=y
+# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set
 CONFIG_PCI_KEYSTONE=y
 CONFIG_PCI_KEYSTONE_HOST=y
 # end of DesignWare-based PCIe controllers
@@ -2553,6 +2555,7 @@ CONFIG_MTD_NAND_TEGRA=m
 CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_ARASAN is not set
 # CONFIG_MTD_NAND_INTEL_LGM is not set
+# CONFIG_MTD_NAND_ROCKCHIP is not set
 
 #
 # Misc
@@ -3169,6 +3172,7 @@ CONFIG_NET_XGENE_V2=m
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
+# CONFIG_EMAC_ROCKCHIP is not set
 CONFIG_NET_VENDOR_ASIX=y
 CONFIG_SPI_AX88796C=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
@@ -3451,6 +3455,7 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_QCOM_ETHQOS=m
+CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SUNXI=m
 CONFIG_DWMAC_SUN8I=m
 CONFIG_DWMAC_IMX8=m
@@ -4718,6 +4723,8 @@ CONFIG_SPI_ORION=m
 CONFIG_SPI_PCI1XXXX=m
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_ROCKCHIP_SFC is not set
 CONFIG_SPI_QCOM_QSPI=m
 CONFIG_SPI_QUP=m
 CONFIG_SPI_QCOM_GENI=m
@@ -4803,6 +4810,7 @@ CONFIG_PINCTRL_MAX77620=y
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_RK805=m
+CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
@@ -4957,6 +4965,7 @@ CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=m
 CONFIG_GPIO_PL061=y
+CONFIG_GPIO_ROCKCHIP=y
 # CONFIG_GPIO_SIFIVE is not set
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_TEGRA=y
@@ -5427,6 +5436,7 @@ CONFIG_K3_THERMAL=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_SUN8I_THERMAL=m
+# CONFIG_ROCKCHIP_THERMAL is not set
 CONFIG_ARMADA_THERMAL=m
 CONFIG_AMLOGIC_THERMAL=m
 
@@ -6258,6 +6268,7 @@ CONFIG_VIDEO_QCOM_VENUS=m
 #
 # Rockchip media platform drivers
 #
+# CONFIG_VIDEO_ROCKCHIP_RGA is not set
 CONFIG_VIDEO_ROCKCHIP_ISP1=m
 
 #
@@ -6289,6 +6300,7 @@ CONFIG_VIDEO_TI_CAL_MC=y
 #
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_HANTRO_IMX8M=y
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_HANTRO_SUNXI=y
 
 #
@@ -7554,6 +7566,7 @@ CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SC8280XP=m
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
+# CONFIG_SND_SOC_ROCKCHIP is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_ACPI=m
@@ -8559,6 +8572,7 @@ CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_HI3798CV200=m
 CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
+# CONFIG_MMC_DW_ROCKCHIP is not set
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
 # CONFIG_MMC_USDHI6ROL0 is not set
@@ -9159,6 +9173,7 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AV7110 is not set
 # CONFIG_VIDEO_MAX96712 is not set
 CONFIG_VIDEO_MESON_VDEC=m
+# CONFIG_VIDEO_ROCKCHIP_VDEC is not set
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUN6I_ISP=m
@@ -9422,6 +9437,14 @@ CONFIG_QCOM_HFPLL=m
 CONFIG_KPSS_XCC=m
 # CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_SM_VIDEOCC_8450 is not set
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_PX30=y
+CONFIG_CLK_RK3308=y
+CONFIG_CLK_RK3328=y
+CONFIG_CLK_RK3368=y
+CONFIG_CLK_RK3399=y
+CONFIG_CLK_RK3568=y
+CONFIG_CLK_RK3588=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_A100_CCU=y
@@ -9453,6 +9476,7 @@ CONFIG_TIMER_ACPI=y
 CONFIG_TIMER_PROBE=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_OMAP_DM_TIMER=y
+CONFIG_ROCKCHIP_TIMER=y
 CONFIG_SUN4I_TIMER=y
 CONFIG_TEGRA_TIMER=y
 CONFIG_TEGRA186_TIMER=y
@@ -9477,6 +9501,7 @@ CONFIG_PLATFORM_MHU=m
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+# CONFIG_ROCKCHIP_MBOX is not set
 CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_BCM2835_MBOX=y
@@ -9512,6 +9537,7 @@ CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
 CONFIG_IOMMU_SVA=y
 CONFIG_IOMMUFD=m
+# CONFIG_ROCKCHIP_IOMMU is not set
 CONFIG_SUN50I_IOMMU=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_APPLE_DART=m
@@ -9680,6 +9706,10 @@ CONFIG_QCOM_ICC_BWMON=m
 CONFIG_QCOM_INLINE_CRYPTO_ENGINE=m
 # end of Qualcomm SoC drivers
 
+CONFIG_ROCKCHIP_GRF=y
+# CONFIG_ROCKCHIP_IODOMAIN is not set
+# CONFIG_ROCKCHIP_PM_DOMAINS is not set
+# CONFIG_ROCKCHIP_DTPM is not set
 CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_SRAM=y
 # CONFIG_SUN20I_PPU is not set
@@ -9726,8 +9756,10 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
+# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
 CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ=m
 CONFIG_PM_DEVFREQ_EVENT=y
+# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
 CONFIG_EXTCON=y
 
 #
@@ -9889,6 +9921,7 @@ CONFIG_QCOM_SPMI_RRADC=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
+# CONFIG_ROCKCHIP_SARADC is not set
 CONFIG_RICHTEK_RTQ6056=m
 CONFIG_SD_ADC_MODULATOR=m
 CONFIG_STMPE_ADC=m
@@ -10401,6 +10434,7 @@ CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_RASPBERRYPI_POE=m
+# CONFIG_PWM_ROCKCHIP is not set
 CONFIG_PWM_STMPE=y
 CONFIG_PWM_SUN4I=m
 CONFIG_PWM_TEGRA=y
@@ -10543,6 +10577,18 @@ CONFIG_PHY_QCOM_USB_HS_28NM=m
 CONFIG_PHY_QCOM_USB_SS=m
 # CONFIG_PHY_QCOM_IPQ806X_USB is not set
 CONFIG_PHY_QCOM_SGMII_ETH=m
+# CONFIG_PHY_ROCKCHIP_DP is not set
+# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+# CONFIG_PHY_ROCKCHIP_EMMC is not set
+# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
+# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set
+# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
+# CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
+# CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set
+# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+# CONFIG_PHY_ROCKCHIP_USB is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
 CONFIG_PHY_TEGRA_XUSB=m
 CONFIG_PHY_TEGRA194_P2U=y
@@ -10647,6 +10693,8 @@ CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 CONFIG_NVMEM_QCOM_SEC_QFPROM=m
 CONFIG_NVMEM_RMEM=m
+# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
+# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_SUNXI_SID=m
@@ -11554,6 +11602,7 @@ CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
 CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
+# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
 CONFIG_CRYPTO_DEV_ZYNQMP_AES=m
 # CONFIG_CRYPTO_DEV_ZYNQMP_SHA3 is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m