[2/3,Config] updateconfigs following snapdragon removal

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d30c12b69196..032388793626 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -113,7 +113,6 @@  CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXTCON=y
-CONFIG_EXTCON_USB_GPIO=m
 CONFIG_F2FS_FS=m
 CONFIG_FB_3DFX=m
 CONFIG_FB_ARK=m
@@ -276,16 +275,11 @@  CONFIG_KARMA_PARTITION=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_LZ4=y
 CONFIG_KEXEC_FILE=y
-CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 CONFIG_KVM=m
 CONFIG_LAPB=m
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LDM_PARTITION=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
@@ -346,7 +340,6 @@  CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
-CONFIG_MICROCHIP_PHY=m
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -415,7 +408,6 @@  CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
-CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=10
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
@@ -457,8 +449,6 @@  CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PM_DEBUG=y
@@ -476,8 +466,6 @@  CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_RAPIDIO=y
@@ -486,10 +474,8 @@  CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RC_CORE=m
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_SPMI=m
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
 CONFIG_REMOTEPROC=y
@@ -498,9 +484,6 @@  CONFIG_RESET_CONTROLLER=y
 CONFIG_RFKILL=y
 CONFIG_RMI4_CORE=m
 CONFIG_ROMFS_FS=m
-CONFIG_RPMSG=m
-CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_PCF8523=m
@@ -547,7 +530,6 @@  CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
@@ -624,28 +606,16 @@  CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_DWC2_PCI=m
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_PCI=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LAN78XX=m
 CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_OHCI_HCD_PLATFORM=y
-# CONFIG_USB_OTG is not set
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_VFIO=y
 CONFIG_VFIO_IOMMU_TYPE1=y
 CONFIG_VFIO_PCI=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 39ef2c237430..e463c0464fed 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -367,7 +367,10 @@  CONFIG_MISC_RTSX_PCI=m
 CONFIG_MLXSW_I2C=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MTD=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
@@ -492,6 +495,7 @@  CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RC_CORE=m
 CONFIG_REED_SOLOMON=m
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
@@ -547,6 +551,7 @@  CONFIG_SCSI_SNIC=m
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -594,6 +599,7 @@  CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SOUND=m
 CONFIG_SPI=y
 CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPMI=m
 CONFIG_SRAM=y
 CONFIG_SSB=m
 CONFIG_STAGING=y
@@ -630,10 +636,14 @@  CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_USB_DWC2_PCI=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EMXX=m
+CONFIG_USB_GADGET=m
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VFIO=m
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index e4a64bdbb353..bb7773a235d2 100644
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -1,88 +1,3 @@ 
 #
 # Config options for config.flavour.generic automatically generated by splitconfig.pl
 #
-CONFIG_COMMON_CLK_QCOM=m
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_HWSPINLOCK_QCOM=m
-CONFIG_INPUT_PM8941_PWRKEY=m
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_MFD_QCOM_RPM=m
-CONFIG_MFD_SPMI_PMIC=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MSM=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MSM_GCC_8916=m
-CONFIG_MSM_GCC_8994=m
-CONFIG_MSM_GCC_8996=m
-CONFIG_MSM_GCC_8998=m
-CONFIG_MSM_MMCC_8996=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_PHY_QCOM_QMP=m
-CONFIG_PHY_QCOM_UFS=m
-CONFIG_PHY_QCOM_UFS_14NM=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
-CONFIG_PINCTRL_MSM8916=m
-CONFIG_PINCTRL_MSM8994=m
-CONFIG_PINCTRL_MSM8996=m
-CONFIG_PINCTRL_MSM8998=m
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
-CONFIG_POWER_RESET_QCOM_PON=m
-CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_APCS_IPC=m
-CONFIG_QCOM_BAM_DMA=m
-CONFIG_QCOM_CLK_APCS_MSM8916=m
-CONFIG_QCOM_CLK_RPMH=m
-CONFIG_QCOM_CLK_SMD_RPM=m
-CONFIG_QCOM_GENI_SE=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_QFPROM=m
-CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_SMEM=m
-CONFIG_QCOM_SMP2P=m
-CONFIG_QCOM_SMSM=m
-CONFIG_QCOM_TSENS=m
-CONFIG_REBOOT_MODE=m
-CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_QCOM_RPMH=m
-CONFIG_REGULATOR_QCOM_SMD_RPM=m
-CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_RPMSG=m
-CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
-CONFIG_RPMSG_QCOM_SMD=m
-CONFIG_RTC_DRV_PM8XXX=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_HISI=m
-CONFIG_SERIAL_QCOM_GENI=m
-CONFIG_SPMI=m
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_OF=m
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_OF_SIMPLE=m
-CONFIG_USB_DWC3_PCI=m
-CONFIG_USB_DWC3_QCOM=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_GADGET=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OTG is not set
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_XHCI_RCAR=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 189f83d70508..bb446601e5f4 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -62,7 +62,6 @@  CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
 CONFIG_CMDLINE_PARTITION=y
-CONFIG_COMMON_CLK_QCOM=m
 CONFIG_COUNTER=m
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CRAMFS=m
@@ -70,7 +69,6 @@  CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_DEBUG_ALIGN_RODATA=y
@@ -116,7 +114,6 @@  CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXTCON=y
-CONFIG_EXTCON_USB_GPIO=m
 CONFIG_F2FS_FS=m
 CONFIG_FB_3DFX=m
 CONFIG_FB_ARK=m
@@ -197,7 +194,6 @@  CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HWMON=y
 CONFIG_HWSPINLOCK=y
-CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
@@ -261,7 +257,6 @@  CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_PM8941_PWRKEY=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
@@ -281,17 +276,12 @@  CONFIG_JME=m
 CONFIG_KARMA_PARTITION=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZ4 is not set
-CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LDM_PARTITION=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
@@ -336,13 +326,11 @@  CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_MFD_MENF21BMC=m
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_PCF50633=m
-CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_RETU=m
 CONFIG_MFD_RT5033=m
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
 CONFIG_MFD_SM501=y
-CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TI_LMU=m
@@ -353,7 +341,6 @@  CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
-CONFIG_MICROCHIP_PHY=m
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -364,13 +351,7 @@  CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MSM_GCC_8916=m
-CONFIG_MSM_GCC_8994=m
-CONFIG_MSM_GCC_8996=m
-CONFIG_MSM_GCC_8998=m
-CONFIG_MSM_MMCC_8996=m
 CONFIG_MTD=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
@@ -432,7 +413,6 @@  CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
-CONFIG_NLS_ISO8859_1=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=4
@@ -464,22 +444,11 @@  CONFIG_PHONET=m
 CONFIG_PHYLIB=y
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHY_QCOM_QMP=m
-CONFIG_PHY_QCOM_UFS=m
-CONFIG_PHY_QCOM_UFS_14NM=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_MSM8916=m
-CONFIG_PINCTRL_MSM8994=m
-CONFIG_PINCTRL_MSM8996=m
-CONFIG_PINCTRL_MSM8998=m
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_POWERCAP=y
 CONFIG_POWER_AVS=y
-CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPP=y
 CONFIG_PPS=y
@@ -493,20 +462,6 @@  CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=y
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_APCS_IPC=m
-CONFIG_QCOM_BAM_DMA=m
-CONFIG_QCOM_CLK_APCS_MSM8916=m
-CONFIG_QCOM_CLK_SMD_RPM=m
-CONFIG_QCOM_GENI_SE=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_QFPROM=m
-CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_SMEM=m
-CONFIG_QCOM_SMP2P=m
-CONFIG_QCOM_SMSM=m
-CONFIG_QCOM_TSENS=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_RAPIDIO=y
@@ -514,13 +469,9 @@  CONFIG_RAVE_SP_CORE=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RC_CORE=m
-CONFIG_REBOOT_MODE=m
 CONFIG_REED_SOLOMON=y
-CONFIG_REGMAP_SPMI=m
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_QCOM_SMD_RPM=m
-CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REISERFS_FS=m
 CONFIG_REMOTEPROC=y
@@ -528,14 +479,9 @@  CONFIG_RESET_CONTROLLER=y
 CONFIG_RFKILL=y
 CONFIG_RMI4_CORE=m
 CONFIG_ROMFS_FS=m
-CONFIG_RPMSG=m
-CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
-CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_S2IO=m
 CONFIG_SATA_AHCI_PLATFORM=y
@@ -580,8 +526,6 @@  CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_HISI=m
 # CONFIG_SCSI_UFS_QCOM is not set
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -599,7 +543,6 @@  CONFIG_SERIAL_FSL_LINFLEXUART=m
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_QCOM_GENI=m
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SCCNXP=y
@@ -662,31 +605,16 @@  CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_OF=m
 CONFIG_USB_DWC2_PCI=y
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_OF_SIMPLE=m
-CONFIG_USB_DWC3_QCOM=m
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EMXX=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_G_MULTI=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LAN78XX=m
 CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_DRIVERS=m
-# CONFIG_USB_OTG is not set
 CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_XHCI_RCAR=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3c87dabf275f..ed80e38583cb 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1850,6 +1850,7 @@  CONFIG_COMMON_CLK_MT8516=y
 CONFIG_COMMON_CLK_MT8516_AUDSYS=y
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
+CONFIG_COMMON_CLK_QCOM=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SAMSUNG=y
@@ -2142,6 +2143,7 @@  CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
 # CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set
 CONFIG_CRYPTO_DEV_QCE_SHA=y
 CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
@@ -3180,6 +3182,7 @@  CONFIG_EXTCON_QCOM_SPMI_MISC=m
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 CONFIG_EXYNOS5422_DMC=m
@@ -4163,6 +4166,7 @@  CONFIG_HWLAT_TRACER=y
 CONFIG_HWMON_VID=m
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HWSPINLOCK_OMAP=m
+CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HWSPINLOCK_SPRD=m
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
@@ -4567,6 +4571,7 @@  CONFIG_INPUT_PCAP=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_PM8941_PWRKEY=m
 CONFIG_INPUT_PM8XXX_VIBRATOR=m
 CONFIG_INPUT_PMIC8XXX_PWRKEY=m
 CONFIG_INPUT_POWERMATE=m
@@ -5065,6 +5070,7 @@  CONFIG_KEYBOARD_BCM=m
 CONFIG_KEYBOARD_CAP11XX=m
 CONFIG_KEYBOARD_CROS_EC=m
 CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_IMX=m
 CONFIG_KEYBOARD_IMX_SC_KEY=m
@@ -5210,6 +5216,7 @@  CONFIG_LEDS_DA903X=m
 CONFIG_LEDS_DA9052=m
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_EL15203000=m
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_IS31FL319X=m
 CONFIG_LEDS_IS31FL32XX=m
@@ -5252,6 +5259,7 @@  CONFIG_LEDS_PCA955X_GPIO=y
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_PM8058=m
 CONFIG_LEDS_POWERNV=m
+CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_SC27XX_BLTC=m
 CONFIG_LEDS_SPI_BYTE=m
@@ -5266,8 +5274,10 @@  CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
@@ -5668,6 +5678,7 @@  CONFIG_MFD_NVEC=m
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_PM8XXX=m
+CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_RC5T583=y
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_RK808=m
@@ -5679,6 +5690,7 @@  CONFIG_MFD_SC27XX_PMIC=m
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SMSC=y
+CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMFX=m
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_STPMIC1=m
@@ -5718,6 +5730,7 @@  CONFIG_MFD_WM8998=y
 # CONFIG_MGEODE_LX is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_PIT64B=y
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROCODE=y
@@ -5842,6 +5855,7 @@  CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI_MILBEAUT=m
+CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_SDHCI_OF_ASPEED=m
 CONFIG_MMC_SDHCI_OF_AT91=m
@@ -5986,13 +6000,18 @@  CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
 CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8916=m
 CONFIG_MSM_GCC_8960=m
 CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8994=m
+CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8998=m
 CONFIG_MSM_GPUCC_8998=m
 # CONFIG_MSM_IOMMU is not set
 CONFIG_MSM_LCC_8960=m
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
+CONFIG_MSM_MMCC_8996=m
 CONFIG_MSM_MMCC_8998=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MS_BLOCK=m
@@ -6725,6 +6744,7 @@  CONFIG_NLS_CODEPAGE_936=m
 CONFIG_NLS_CODEPAGE_949=m
 CONFIG_NLS_CODEPAGE_950=m
 CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_13=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
@@ -7242,7 +7262,12 @@  CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_QCOM_PCIE2=m
+CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_14NM=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_RCAR_GEN2=m
 CONFIG_PHY_RCAR_GEN3_PCIE=m
 CONFIG_PHY_RCAR_GEN3_USB2=m
@@ -7353,8 +7378,12 @@  CONFIG_PINCTRL_MESON_GXBB=y
 CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MSM8660=m
+CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
 CONFIG_PINCTRL_MSM8976=m
+CONFIG_PINCTRL_MSM8994=m
+CONFIG_PINCTRL_MSM8996=m
+CONFIG_PINCTRL_MSM8998=m
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MT2701=y
 CONFIG_PINCTRL_MT2712=y
@@ -7404,6 +7433,7 @@  CONFIG_PINCTRL_PFC_R8A77980=y
 CONFIG_PINCTRL_PFC_R8A77990=y
 CONFIG_PINCTRL_PFC_R8A77995=y
 CONFIG_PINCTRL_PFC_SH73A0=y
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_QCS404=m
 CONFIG_PINCTRL_QDF2XXX=m
@@ -7549,6 +7579,7 @@  CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_LTC2952=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_MT6323=y
+CONFIG_POWER_RESET_QCOM_PON=m
 # CONFIG_POWER_RESET_QNAP is not set
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_RMOBILE=m
@@ -7743,9 +7774,15 @@  CONFIG_PXA168_ETH=m
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
 CONFIG_QCA7000_UART=m
+CONFIG_QCOM_A53PLL=m
 CONFIG_QCOM_AOSS_QMP=m
+CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_CLK_APCS_MSM8916=m
 CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_RPMH=m
+CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
 CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_CPR=m
@@ -7756,9 +7793,12 @@  CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_QCOM_FASTRPC=m
 CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_GENI_SE=m
 CONFIG_QCOM_GLINK_SSR=m
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_HFPLL=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_IOMMU=y
 CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_QCOM_L2_PMU=y
@@ -7775,22 +7815,27 @@  CONFIG_QCOM_Q6V5_MSS=m
 CONFIG_QCOM_Q6V5_PAS=m
 CONFIG_QCOM_Q6V5_WCSS=m
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
+CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_QMI_HELPERS=m
 CONFIG_QCOM_RMTFS_MEM=m
 CONFIG_QCOM_RPMCC=y
 CONFIG_QCOM_RPMH=y
 CONFIG_QCOM_RPMHPD=y
-# CONFIG_QCOM_RPMPD is not set
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMEM_STATE=y
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SYSMON=m
+CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_VADC_COMMON=m
 CONFIG_QCOM_WCNSS_CTRL=m
 # CONFIG_QCOM_WCNSS_PIL is not set
@@ -7940,6 +7985,7 @@  CONFIG_RD_XZ=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=m
+CONFIG_REBOOT_MODE=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
@@ -7954,6 +8000,7 @@  CONFIG_REGMAP_SCCB=m
 CONFIG_REGMAP_SLIMBUS=m
 CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_W1=m
 CONFIG_REGULATOR_88PG86X=m
 CONFIG_REGULATOR_88PM800=m
@@ -8036,6 +8083,9 @@  CONFIG_REGULATOR_PV88080=m
 CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_RPMH=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RC5T583=m
 CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_RN5T618=m
@@ -8168,9 +8218,13 @@  CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_MTK_SCP=m
+CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
+CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RPS=y
 CONFIG_RSEQ=y
@@ -8307,6 +8361,7 @@  CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=m
+CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RC5T583=m
@@ -8568,10 +8623,12 @@  CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 CONFIG_SCSI_UFS_DWC_TC_PCI=m
 CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_UFS_HISI=m
 CONFIG_SCSI_UFS_MEDIATEK=m
 CONFIG_SCSI_UFS_TI_J721E=m
 CONFIG_SCSI_VIRTIO=m
@@ -8924,6 +8981,7 @@  CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_OWL=y
 CONFIG_SERIAL_OWL_CONSOLE=y
 CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_QCOM_GENI=m
 CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
 CONFIG_SERIAL_QE=m
 CONFIG_SERIAL_RDA=y
@@ -10617,7 +10675,9 @@  CONFIG_USB_CDNS3_IMX=m
 CONFIG_USB_CDNS3_PCI_WRAP=m
 CONFIG_USB_CDNS3_TI=m
 CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_OF=m
 CONFIG_USB_CHIPIDEA_PCI=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_COMMON=y
@@ -10655,6 +10715,7 @@  CONFIG_USB_DWC2=y
 CONFIG_USB_DWC2_HOST=y
 # CONFIG_USB_DWC2_PERIPHERAL is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_EXYNOS=m
 # CONFIG_USB_DWC3_GADGET is not set
@@ -10662,7 +10723,10 @@  CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3_MESON_G12A=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
 CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_QCOM=m
 CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_EG20T=m
@@ -10791,6 +10855,7 @@  CONFIG_USB_HACKRF=m
 # CONFIG_USB_HCD_TEST_MODE is not set
 CONFIG_USB_HID=m
 CONFIG_USB_HIDDEV=y
+CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_HSO=m
 CONFIG_USB_HUB_USB251XB=m
@@ -10812,6 +10877,7 @@  CONFIG_USB_KAWETH=m
 CONFIG_USB_KBD=m
 CONFIG_USB_KC2190=y
 CONFIG_USB_KEENE=m
+CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
@@ -10853,6 +10919,7 @@  CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
 CONFIG_USB_NET_AQC111=m
 CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_CDC_MBIM=m
@@ -10861,6 +10928,8 @@  CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_HUAWEI_CDC_NCM=m
 CONFIG_USB_NET_INT51X1=m
@@ -10883,8 +10952,8 @@  CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
 # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_PCI=y
@@ -11006,7 +11075,9 @@  CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_UHCI_PLATFORM=y
 CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
 CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
 CONFIG_USB_U_AUDIO=m
 CONFIG_USB_U_ETHER=m
@@ -11025,12 +11096,13 @@  CONFIG_USB_XHCI_HISTB=m
 CONFIG_USB_XHCI_MTK=m
 CONFIG_USB_XHCI_MVEBU=m
 CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_RCAR=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_ZERO=m
-# CONFIG_USB_ZERO_HNPTEST is not set
 CONFIG_USB_ZR364XX=m
 CONFIG_USELIB=y
 CONFIG_USERFAULTFD=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a1ad8185c5ec..54e53f825c0f 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -110,7 +110,6 @@  CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
 # CONFIG_EVM_LOAD_X509 is not set
 CONFIG_EXTCON=y
-CONFIG_EXTCON_USB_GPIO=m
 CONFIG_F2FS_FS=m
 CONFIG_FB_3DFX=m
 CONFIG_FB_ARK=m
@@ -272,16 +271,11 @@  CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_LZ4=y
-CONFIG_KEYBOARD_GPIO=m
 CONFIG_KVM=m
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LDM_PARTITION=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
@@ -340,7 +334,6 @@  CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
-CONFIG_MICROCHIP_PHY=m
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -409,7 +402,6 @@  CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
-CONFIG_NLS_ISO8859_1=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=8
@@ -449,8 +441,6 @@  CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PM_DEBUG=y
@@ -468,8 +458,6 @@  CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_RAPIDIO=y
@@ -478,10 +466,8 @@  CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RC_CORE=m
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_SPMI=m
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
 CONFIG_REMOTEPROC=y
@@ -490,9 +476,6 @@  CONFIG_RESET_CONTROLLER=y
 CONFIG_RFKILL=y
 CONFIG_RMI4_CORE=m
 CONFIG_ROMFS_FS=m
-CONFIG_RPMSG=m
-CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_PCF8523=m
@@ -539,7 +522,6 @@  CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
@@ -616,28 +598,16 @@  CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_DWC2_PCI=m
-CONFIG_USB_DWC3=m
-CONFIG_USB_DWC3_PCI=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LAN78XX=m
 CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_OHCI_HCD_PLATFORM=y
-# CONFIG_USB_OTG is not set
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d86975018125..320c5d6877c2 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -111,7 +111,6 @@  CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EXTCON=y
-CONFIG_EXTCON_USB_GPIO=m
 CONFIG_F2FS_FS=m
 CONFIG_FB_3DFX=m
 CONFIG_FB_ARK=m
@@ -275,17 +274,12 @@  CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KERNEL_GZIP=y
 CONFIG_KEXEC_FILE=y
-CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LDM_PARTITION=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
@@ -348,7 +342,6 @@  CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
-CONFIG_MICROCHIP_PHY=m
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -421,7 +414,6 @@  CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NFP=m
-CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=8
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
@@ -456,8 +448,6 @@  CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHY_QCOM_USB_HS=m
-CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PINCTRL=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
@@ -476,8 +466,6 @@  CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
 CONFIG_RAPIDIO=y
@@ -485,12 +473,9 @@  CONFIG_RAVE_SP_CORE=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RC_CORE=m
-CONFIG_REBOOT_MODE=m
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_SPMI=m
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
 CONFIG_REMOTEPROC=y
@@ -499,9 +484,6 @@  CONFIG_RESET_CONTROLLER=y
 CONFIG_RFKILL=y
 CONFIG_RMI4_CORE=m
 CONFIG_ROMFS_FS=m
-CONFIG_RPMSG=m
-CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
-CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_VIRTIO=m
 CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_PCF8523=m
@@ -549,7 +531,6 @@  CONFIG_SCSI_SRP_ATTRS=y
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
@@ -626,28 +607,16 @@  CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_OF=m
 CONFIG_USB_DWC2_PCI=m
-CONFIG_USB_DWC3=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_GADGET=m
 # CONFIG_USB_G_MULTI is not set
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LAN78XX=m
 CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OTG is not set
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_VIRQFD=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index e894ad94e432..4c56a109aa3a 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -326,7 +326,6 @@  CONFIG_MFD_CORE=m
 # CONFIG_MFD_TQMX86 is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_WM8994 is not set
-CONFIG_MICROCHIP_PHY=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MISC_ALCOR_PCI is not set
@@ -384,7 +383,6 @@  CONFIG_MICROCHIP_PHY=m
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFC is not set
 # CONFIG_NFP is not set
-CONFIG_NLS_ISO8859_1=m
 CONFIG_NODES_SHIFT=4
 # CONFIG_NOZOMI is not set
 CONFIG_NR_CPUS=256