diff --git a/arch/arm64/configs/odroidc5_defconfig b/arch/arm64/configs/odroidc5_defconfig
index e99950aadbb5..c5000247bcc0 100644
--- a/arch/arm64/configs/odroidc5_defconfig
+++ b/arch/arm64/configs/odroidc5_defconfig
@@ -315,7 +315,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
-CONFIG_ARCH_SUNXI=y
+# CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
 # CONFIG_ARCH_BCM2835 is not set
@@ -329,13 +329,13 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_LG1K is not set
-CONFIG_ARCH_HISI=y
+# CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_QCOM=y
+# CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_ROCKCHIP is not set
@@ -352,6 +352,8 @@ CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
 # CONFIG_ARCH_ZYNQMP is not set
+CONFIG_ARCH_MESON_ODROID_COMMON=y
+CONFIG_ARCH_MESON_ODROIDC5=y
 # end of Platform selection
 
 #
@@ -610,7 +612,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CONFIG_CPUFREQ_DT is not set
 # CONFIG_CPUFREQ_DUMMY is not set
 CONFIG_ARM_SCPI_CPUFREQ=y
-# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
 CONFIG_ARM_SCMI_CPUFREQ=y
 # end of CPU Frequency scaling
 # end of CPU Power Management
@@ -1664,9 +1665,7 @@ CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCIE_DW_PLAT_EP=y
 # CONFIG_PCI_HISI is not set
-CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_KIRIN=y
-# CONFIG_PCIE_HISI_STB is not set
 # CONFIG_PCI_MESON is not set
 # CONFIG_PCIE_AL is not set
 # end of DesignWare PCI Core Support
@@ -1754,10 +1753,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
-# CONFIG_HISILICON_LPC is not set
-CONFIG_QCOM_EBI2=y
-# CONFIG_SUN50I_DE2_BUS is not set
-# CONFIG_SUNXI_RSB is not set
 # CONFIG_VEXPRESS_CONFIG is not set
 # CONFIG_MHI_BUS is not set
 # end of Bus devices
@@ -1881,7 +1876,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_HI6421V600_IRQ is not set
 # CONFIG_HP_ILO is not set
-# CONFIG_QCOM_FASTRPC is not set
 # CONFIG_APDS9802ALS is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISL29020 is not set
@@ -2106,8 +2100,6 @@ CONFIG_NET_VENDOR_AGERE=y
 # CONFIG_ET131X is not set
 CONFIG_NET_VENDOR_ALACRITECH=y
 # CONFIG_SLICOSS is not set
-CONFIG_NET_VENDOR_ALLWINNER=y
-# CONFIG_SUN4I_EMAC is not set
 CONFIG_NET_VENDOR_ALTEON=y
 # CONFIG_ACENIC is not set
 # CONFIG_ALTERA_TSE is not set
@@ -2360,7 +2352,6 @@ CONFIG_MDIO_BUS=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_OF_MDIO=y
 CONFIG_MDIO_DEVRES=y
-# CONFIG_MDIO_SUN4I is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2527,7 +2518,6 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -2674,7 +2664,6 @@ CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
-# CONFIG_INPUT_HISI_POWERKEY is not set
 # CONFIG_RMI4_CORE is not set
 
 #
@@ -2690,7 +2679,6 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_SUN4I_PS2 is not set
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set
@@ -2749,10 +2737,6 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MSM is not set
-CONFIG_SERIAL_QCOM_GENI=y
-# CONFIG_SERIAL_QCOM_GENI_CONSOLE_DEFAULT_ENABLED is not set
-CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -2785,7 +2769,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
-CONFIG_HW_RANDOM_HISI=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
@@ -2830,7 +2813,6 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_HIX5HD2 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_ISCH is not set
 # CONFIG_I2C_PIIX4 is not set
@@ -2851,13 +2833,9 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_MV64XXX is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_QCOM_CCI is not set
-# CONFIG_I2C_QCOM_GENI is not set
-# CONFIG_I2C_QUP is not set
 # CONFIG_I2C_RK3X is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_THUNDERX is not set
@@ -2911,13 +2889,8 @@ CONFIG_SPI_MEM=y
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_QCOM_QSPI is not set
-# CONFIG_SPI_QUP is not set
-# CONFIG_SPI_QCOM_GENI is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_XCOMM is not set
@@ -2939,7 +2912,6 @@ CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_SLAVE is not set
 CONFIG_SPMI=y
 # CONFIG_SPMI_HISI3670 is not set
-# CONFIG_SPMI_MSM_PMIC_ARB is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=y
 # CONFIG_PPS_DEBUG is not set
@@ -2982,39 +2954,12 @@ CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
-# CONFIG_PINCTRL_MSM is not set
-# CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set
-# CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
-# CONFIG_PINCTRL_LPASS_LPI is not set
 
 #
 # Renesas pinctrl drivers
 #
 # end of Renesas pinctrl drivers
 
-# CONFIG_PINCTRL_SUN4I_A10 is not set
-# CONFIG_PINCTRL_SUN5I is not set
-# CONFIG_PINCTRL_SUN6I_A31 is not set
-# CONFIG_PINCTRL_SUN6I_A31_R is not set
-# CONFIG_PINCTRL_SUN8I_A23 is not set
-# CONFIG_PINCTRL_SUN8I_A33 is not set
-# CONFIG_PINCTRL_SUN8I_A83T is not set
-# CONFIG_PINCTRL_SUN8I_A83T_R is not set
-# CONFIG_PINCTRL_SUN8I_A23_R is not set
-# CONFIG_PINCTRL_SUN8I_H3 is not set
-# CONFIG_PINCTRL_SUN8I_H3_R is not set
-# CONFIG_PINCTRL_SUN8I_V3S is not set
-# CONFIG_PINCTRL_SUN9I_A80 is not set
-# CONFIG_PINCTRL_SUN9I_A80_R is not set
-# CONFIG_PINCTRL_SUN50I_A64 is not set
-# CONFIG_PINCTRL_SUN50I_A64_R is not set
-# CONFIG_PINCTRL_SUN50I_A100 is not set
-# CONFIG_PINCTRL_SUN50I_A100_R is not set
-# CONFIG_PINCTRL_SUN50I_H5 is not set
-# CONFIG_PINCTRL_SUN50I_H6 is not set
-# CONFIG_PINCTRL_SUN50I_H6_R is not set
-# CONFIG_PINCTRL_SUN50I_H616 is not set
-# CONFIG_PINCTRL_SUN50I_H616_R is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
@@ -3115,8 +3060,6 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_BRCMSTB is not set
 # CONFIG_POWER_RESET_GPIO is not set
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
-CONFIG_POWER_RESET_HISI=y
-# CONFIG_POWER_RESET_MSM is not set
 # CONFIG_POWER_RESET_LTC2952 is not set
 # CONFIG_POWER_RESET_REGULATOR is not set
 # CONFIG_POWER_RESET_RESTART is not set
@@ -3187,17 +3130,7 @@ CONFIG_CPU_IDLE_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 # CONFIG_THERMAL_MMIO is not set
-CONFIG_HISI_THERMAL=y
-# CONFIG_SUN8I_THERMAL is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
-
-#
-# Qualcomm thermal drivers
-#
-# CONFIG_QCOM_SPMI_ADC_TM5 is not set
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
-# end of Qualcomm thermal drivers
-
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3222,9 +3155,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_ARM_SBSA_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
-# CONFIG_SUNXI_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_QCOM_WDT is not set
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_I6300ESB_WDT is not set
@@ -3250,7 +3181,6 @@ CONFIG_BCMA_POSSIBLE=y
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_ACT8945A=y
-# CONFIG_MFD_SUN4I_GPADC is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
@@ -3275,7 +3205,6 @@ CONFIG_MFD_ACT8945A=y
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI6421_SPMI is not set
-# CONFIG_MFD_HI655X_PMIC is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
@@ -3306,8 +3235,6 @@ CONFIG_MFD_ACT8945A=y
 # CONFIG_MFD_NTXEC is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_QCOM_RPM is not set
-# CONFIG_MFD_SPMI_PMIC is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
@@ -3319,7 +3246,6 @@ CONFIG_MFD_ACT8945A=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SUN6I_PRCM is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
@@ -3434,7 +3360,6 @@ CONFIG_AMLOGIC_PWM_REGULATOR=y
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
-# CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
 CONFIG_RC_CORE=y
 # CONFIG_RC_MAP is not set
@@ -3468,7 +3393,6 @@ CONFIG_RC_DEVICES=y
 # CONFIG_IR_GPIO_CIR is not set
 # CONFIG_IR_GPIO_TX is not set
 # CONFIG_IR_PWM_TX is not set
-# CONFIG_IR_SUNXI is not set
 # CONFIG_IR_SERIAL is not set
 # CONFIG_IR_SIR is not set
 # CONFIG_RC_XBOX_DVD is not set
@@ -3645,14 +3569,9 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_ASPEED is not set
 # CONFIG_VIDEO_MUX is not set
-# CONFIG_VIDEO_QCOM_CAMSS is not set
 # CONFIG_VIDEO_XILINX is not set
-# CONFIG_VIDEO_SUN4I_CSI is not set
-# CONFIG_VIDEO_SUN6I_CSI is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_SUN8I_DEINTERLACE is not set
-# CONFIG_VIDEO_SUN8I_ROTATE is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
 
 #
@@ -4111,10 +4030,8 @@ CONFIG_DRM_GEM_SHMEM_HELPER=y
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_SUN4I is not set
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_VIRTIO_GPU is not set
-# CONFIG_DRM_MSM is not set
 CONFIG_DRM_PANEL=y
 
 #
@@ -4482,7 +4399,6 @@ CONFIG_SND_SOC_TOPOLOGY=y
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
-# CONFIG_SND_SOC_QCOM is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
 
 #
@@ -4490,17 +4406,6 @@ CONFIG_SND_SOC_TOPOLOGY=y
 #
 # end of STMicroelectronics STM32 SOC audio support
 
-#
-# Allwinner SoC Audio support
-#
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN8I_CODEC is not set
-# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
-# CONFIG_SND_SUN50I_CODEC_ANALOG is not set
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
-# end of Allwinner SoC Audio support
-
 # CONFIG_SND_SOC_XILINX_I2S is not set
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
@@ -4837,7 +4742,6 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PCI_RENESAS=y
 CONFIG_USB_XHCI_PLATFORM=y
-# CONFIG_USB_XHCI_HISTB is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -4904,7 +4808,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 #
 CONFIG_USB_DWC3_HAPS=y
 CONFIG_USB_DWC3_OF_SIMPLE=y
-CONFIG_USB_DWC3_QCOM=y
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_ISP1760 is not set
@@ -5109,7 +5012,6 @@ CONFIG_TYPEC_UCSI=y
 # CONFIG_TYPEC_TPS6598X is not set
 # CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_STUSB160X is not set
-# CONFIG_TYPEC_QCOM_PMIC is not set
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -5150,7 +5052,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_CADENCE is not set
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 # CONFIG_MMC_SDHCI_MILBEAUT is not set
-# CONFIG_MMC_SDHCI_MSM is not set
 # CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_CB710 is not set
@@ -5159,7 +5060,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
-# CONFIG_MMC_SUNXI is not set
 CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_HSQ is not set
 # CONFIG_MMC_TOSHIBA_PCI is not set
@@ -5174,8 +5074,6 @@ CONFIG_SCSI_UFSHCD_PCI=y
 CONFIG_SCSI_UFSHCD_PLATFORM=y
 # CONFIG_SCSI_UFS_CDNS_PLATFORM is not set
 CONFIG_SCSI_UFS_DWC_TC_PLATFORM=y
-# CONFIG_SCSI_UFS_QCOM is not set
-CONFIG_SCSI_UFS_HISI=y
 CONFIG_SCSI_UFS_VARIABLE_SG_ENTRY_SIZE=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -5374,7 +5272,6 @@ CONFIG_RTC_I2C_AND_SPI=y
 #
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-# CONFIG_RTC_DRV_SUN6I is not set
 # CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_R7301 is not set
@@ -5395,21 +5292,16 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set
-# CONFIG_DMA_SUN6I is not set
 # CONFIG_DW_AXI_DMAC is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_QDMA is not set
-# CONFIG_HISI_DMA is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_K3_DMA is not set
 # CONFIG_MV_XOR_V2 is not set
 # CONFIG_PL330_DMA is not set
 # CONFIG_PLX_DMA is not set
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
-# CONFIG_QCOM_BAM_DMA is not set
-# CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_DW_DMAC is not set
@@ -5597,24 +5489,8 @@ CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
-CONFIG_COMMON_CLK_HI3516CV300=y
-CONFIG_COMMON_CLK_HI3519=y
-CONFIG_COMMON_CLK_HI3559A=y
-CONFIG_COMMON_CLK_HI3660=y
-CONFIG_COMMON_CLK_HI3670=y
-CONFIG_COMMON_CLK_HI3798CV200=y
-CONFIG_COMMON_CLK_HI6220=y
-CONFIG_RESET_HISI=y
-CONFIG_STUB_CLK_HI6220=y
-CONFIG_STUB_CLK_HI3660=y
-CONFIG_QCOM_GDSC=y
-# CONFIG_COMMON_CLK_QCOM is not set
-# CONFIG_CLK_SUNXI is not set
-# CONFIG_SUNXI_CCU is not set
 # CONFIG_XILINX_VCU is not set
 CONFIG_HWSPINLOCK=y
-# CONFIG_HWSPINLOCK_QCOM is not set
-# CONFIG_HWSPINLOCK_SUN6I is not set
 
 #
 # Clock Source drivers
@@ -5629,8 +5505,6 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set
-CONFIG_ARM_TIMER_SP804=y
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers
 
@@ -5640,12 +5514,7 @@ CONFIG_MAILBOX=y
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
-CONFIG_HI3660_MBOX=y
-CONFIG_HI6220_MBOX=y
 # CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
-CONFIG_SUN6I_MSGBOX=y
-# CONFIG_QCOM_IPCC is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
@@ -5666,10 +5535,8 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
-# CONFIG_SUN50I_IOMMU is not set
 # CONFIG_ARM_SMMU is not set
 # CONFIG_ARM_SMMU_V3 is not set
-# CONFIG_QCOM_IOMMU is not set
 # CONFIG_VIRTIO_IOMMU is not set
 
 #
@@ -5677,7 +5544,6 @@ CONFIG_IOMMU_DMA=y
 #
 CONFIG_REMOTEPROC=y
 CONFIG_REMOTEPROC_CDEV=y
-# CONFIG_QCOM_SYSMON is not set
 # end of Remoteproc drivers
 
 #
@@ -5729,24 +5595,9 @@ CONFIG_RPMSG_CTRL=y
 #
 # Qualcomm SoC drivers
 #
-# CONFIG_QCOM_AOSS_QMP is not set
-# CONFIG_QCOM_COMMAND_DB is not set
-# CONFIG_QCOM_CPR is not set
-CONFIG_QCOM_GENI_SE=y
-# CONFIG_QCOM_GSBI is not set
-# CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_OCMEM is not set
-# CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_RPMH is not set
-# CONFIG_QCOM_SMEM is not set
-# CONFIG_QCOM_SMD_RPM is not set
 CONFIG_QCOM_SMEM_STATE=y
-# CONFIG_QCOM_WCNSS_CTRL is not set
-# CONFIG_QCOM_APR is not set
 # end of Qualcomm SoC drivers
 
-CONFIG_SUNXI_MBUS=y
-CONFIG_SUNXI_SRAM=y
 # CONFIG_SOC_TI is not set
 
 #
@@ -5780,7 +5631,6 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_GPIO is not set
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_PTN5150 is not set
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_USB_GPIO is not set
@@ -6275,9 +6125,7 @@ CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_HIBVT is not set
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_SUN4I is not set
 
 #
 # IRQ chip support
@@ -6290,22 +6138,13 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
 # CONFIG_AL_FIC is not set
-CONFIG_HISILICON_IRQ_MBIGEN=y
 CONFIG_PARTITION_PERCPU=y
-# CONFIG_QCOM_PDC is not set
 # end of IRQ chip support
 
 # CONFIG_IPACK_BUS is not set
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_QCOM_AOSS is not set
-# CONFIG_RESET_QCOM_PDC is not set
 CONFIG_RESET_SCMI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_SUNXI=y
 # CONFIG_RESET_TI_SYSCON is not set
-CONFIG_COMMON_RESET_HI3660=y
-CONFIG_COMMON_RESET_HI6220=y
 
 #
 # PHY Subsystem
@@ -6314,10 +6153,6 @@ CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_XGENE is not set
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
-# CONFIG_PHY_SUN4I_USB is not set
-# CONFIG_PHY_SUN6I_MIPI_DPHY is not set
-# CONFIG_PHY_SUN9I_USB is not set
-# CONFIG_PHY_SUN50I_USB3 is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
@@ -6325,26 +6160,11 @@ CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CADENCE_SALVO is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_HI6220_USB is not set
-# CONFIG_PHY_HI3660_USB is not set
-# CONFIG_PHY_HI3670_USB is not set
-# CONFIG_PHY_HISTB_COMBPHY is not set
-# CONFIG_PHY_HISI_INNO_USB2 is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_QCOM_APQ8064_SATA is not set
-# CONFIG_PHY_QCOM_IPQ4019_USB is not set
-# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
-# CONFIG_PHY_QCOM_QMP is not set
-# CONFIG_PHY_QCOM_QUSB2 is not set
-# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
-# CONFIG_PHY_QCOM_USB_HS_28NM is not set
-# CONFIG_PHY_QCOM_USB_SS is not set
-# CONFIG_PHY_QCOM_IPQ806X_USB is not set
 # CONFIG_PHY_RTK_RTD_USB2PHY is not set
 # CONFIG_PHY_RTK_RTD_USB3PHY is not set
 # end of PHY Subsystem
@@ -6395,9 +6215,7 @@ CONFIG_DAX=y
 # CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_QCOM_QFPROM is not set
 # CONFIG_NVMEM_SPMI_SDAM is not set
-# CONFIG_NVMEM_SUNXI_SID is not set
 # CONFIG_NVMEM_RMEM is not set
 
 #
@@ -6414,7 +6232,6 @@ CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=y
-# CONFIG_INTERCONNECT_QCOM is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 CONFIG_AMLOGIC_DRIVER=y
@@ -7168,11 +6985,7 @@ CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_PLATFORM=y
 CONFIG_DWMAC_DWC_QOS_ETH=y
 # CONFIG_DWMAC_GENERIC is not set
-# CONFIG_DWMAC_IPQ806X is not set
 CONFIG_DWMAC_MESON=y
-# CONFIG_DWMAC_QCOM_ETHQOS is not set
-# CONFIG_DWMAC_SUNXI is not set
-# CONFIG_DWMAC_SUN8I is not set
 # CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_STMMAC_PCI is not set
@@ -7769,17 +7582,11 @@ CONFIG_CRYPTO_JITTERENTROPY=y
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_ALLWINNER=y
-# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
-# CONFIG_CRYPTO_DEV_SUN8I_CE is not set
-# CONFIG_CRYPTO_DEV_SUN8I_SS is not set
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_CCP is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
-# CONFIG_CRYPTO_DEV_QCE is not set
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set