diff --git a/config/kernel/linux-imx6-current.config b/config/kernel/linux-imx6-current.config
index 6967289c4..e7703a05b 100644
--- a/config/kernel/linux-imx6-current.config
+++ b/config/kernel/linux-imx6-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.8.11 Kernel Configuration
+# Linux/arm 5.9.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10)) 9.2.1 20191025"
 CONFIG_CC_IS_GCC=y
@@ -96,7 +96,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
-# CONFIG_SCHED_THERMAL_PRESSURE is not set
+CONFIG_SCHED_THERMAL_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -179,6 +179,7 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
 CONFIG_BOOT_CONFIG=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -415,6 +416,7 @@ CONFIG_MACH_MMP3_DT=y
 # end of Marvell PXA168/910/MMP2 Implementations
 
 # CONFIG_USB_EHCI_MV_U2O is not set
+# CONFIG_ARCH_MSTARV7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_MVEBU_ANY=y
 CONFIG_MACH_MVEBU_V7=y
@@ -842,6 +844,7 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 
 #
 # Tegra firmware driver
@@ -867,6 +870,7 @@ CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_POLY1305_ARM=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_CURVE25519_NEON=m
+CONFIG_AS_VFP_VMRS_FPINST=y
 
 #
 # General architecture-dependent options
@@ -906,7 +910,6 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 # CONFIG_STACKPROTECTOR is not set
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -918,7 +921,6 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
@@ -1651,6 +1653,7 @@ CONFIG_NET_DSA_TAG_DSA=m
 CONFIG_NET_DSA_TAG_EDSA=m
 CONFIG_NET_DSA_TAG_MTK=m
 CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
 CONFIG_NET_DSA_TAG_OCELOT=m
 CONFIG_NET_DSA_TAG_QCA=m
 CONFIG_NET_DSA_TAG_LAN9303=m
@@ -2166,6 +2169,7 @@ CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_CADENCE_PLAT=y
 CONFIG_PCIE_CADENCE_PLAT_HOST=y
+# CONFIG_PCI_J721E_HOST is not set
 # end of Cadence PCIe controllers support
 # end of PCI controller drivers
 
@@ -2229,7 +2233,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_CACHE=y
 # end of Firmware loader
@@ -2369,6 +2374,9 @@ CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_ST_SPI_FSM=m
 # end of Self-contained MTD device drivers
 
+#
+# NAND
+#
 CONFIG_MTD_NAND_CORE=m
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_NAND_ECC_SW_HAMMING=m
@@ -2410,6 +2418,7 @@ CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_RICOH=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 CONFIG_MTD_SPI_NAND=m
+# end of NAND
 
 #
 # LPDDR & LPDDR2 PCM memory drivers
@@ -2420,7 +2429,6 @@ CONFIG_MTD_SPI_NAND=m
 
 CONFIG_MTD_SPI_NOR=m
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -2481,6 +2489,7 @@ CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m
 CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_PASSTHRU is not set
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
@@ -2641,6 +2650,8 @@ CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_EXYNOS=m
+# CONFIG_SCSI_UFS_CRYPTO is not set
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_MYRB=m
 CONFIG_SCSI_MYRS=m
@@ -2808,7 +2819,7 @@ CONFIG_MD_FAULTY=m
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_DEBUG=y
@@ -3194,6 +3205,7 @@ CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX=m
@@ -3482,6 +3494,7 @@ CONFIG_MT7601U=m
 CONFIG_MT76_CORE=m
 CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
 CONFIG_MT76x0_COMMON=m
@@ -3493,8 +3506,13 @@ CONFIG_MT76x2U=m
 CONFIG_MT7603E=m
 CONFIG_MT7615_COMMON=m
 CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
 CONFIG_MT7663U=m
+CONFIG_MT7663S=m
 CONFIG_MT7915E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3554,9 +3572,11 @@ CONFIG_RTW88_PCI=m
 CONFIG_RTW88_8822B=m
 CONFIG_RTW88_8822C=m
 CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
 CONFIG_RTW88_8822CE=m
 CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_DEBUG is not set
 # CONFIG_RTW88_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
@@ -4002,6 +4022,7 @@ CONFIG_SERIAL_TEGRA=y
 # CONFIG_SERIAL_PXA is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+# CONFIG_SERIAL_IMX_EARLYCON is not set
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_UARTLITE_NR_UARTS=1
@@ -4060,11 +4081,13 @@ CONFIG_IPMI_POWEROFF=m
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_BA431=m
 CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_IPROC_RNG200=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_ST=m
 CONFIG_HW_RANDOM_STM32=m
 CONFIG_HW_RANDOM_MESON=m
@@ -4230,6 +4253,7 @@ CONFIG_SPI_BCM2835AUX=m
 # CONFIG_SPI_BCM_QSPI is not set
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_CADENCE=m
+# CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_PCI=m
@@ -4467,6 +4491,7 @@ CONFIG_GPIO_ZYNQ=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCA9570=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
@@ -4572,6 +4597,7 @@ CONFIG_POWER_RESET_AS3722=y
 # CONFIG_POWER_RESET_BRCMSTB is not set
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_LINKSTATION=m
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_QCOM_PON=m
 # CONFIG_POWER_RESET_LTC2952 is not set
@@ -4633,6 +4659,7 @@ CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
 # CONFIG_CHARGER_BQ24257 is not set
 CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
 # CONFIG_CHARGER_BQ25890 is not set
 CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_TPS65090=m
@@ -4675,6 +4702,7 @@ CONFIG_SENSORS_ARM_SCMI=m
 CONFIG_SENSORS_ARM_SCPI=m
 CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
 CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -4832,6 +4860,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
@@ -4846,7 +4875,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
-CONFIG_CLOCK_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_THERMAL_MMIO=m
@@ -4906,6 +4934,7 @@ CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 # end of Qualcomm thermal drivers
 
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -5070,7 +5099,6 @@ CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 CONFIG_MFD_STMPE=y
 
@@ -5132,6 +5160,7 @@ CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
 CONFIG_MFD_STPMIC1=m
 # CONFIG_MFD_STMFX is not set
+CONFIG_MFD_KHADAS_MCU=m
 CONFIG_MFD_VEXPRESS_SYSREG=y
 # CONFIG_RAVE_SP_CORE is not set
 # end of Multifunction device drivers
@@ -5149,12 +5178,14 @@ CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_AXP20X=m
 CONFIG_REGULATOR_BD71828=m
 CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_CROS_EC=m
 CONFIG_REGULATOR_DA9052=m
 CONFIG_REGULATOR_DA9055=m
 CONFIG_REGULATOR_DA9063=m
 CONFIG_REGULATOR_DA9210=m
 CONFIG_REGULATOR_DA9211=m
 CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_FAN53880=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_ISL6271A=m
@@ -5190,6 +5221,7 @@ CONFIG_REGULATOR_MPQ7920=m
 # CONFIG_REGULATOR_MT6311 is not set
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_PBIAS=m
+CONFIG_REGULATOR_PCA9450=m
 CONFIG_REGULATOR_PFUZE100=m
 CONFIG_REGULATOR_PV88060=m
 # CONFIG_REGULATOR_PV88080 is not set
@@ -5198,6 +5230,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_QCOM_USB_VBUS=m
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_ROHM=m
 CONFIG_REGULATOR_S2MPA01=m
@@ -5211,6 +5244,7 @@ CONFIG_REGULATOR_STPMIC1=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_SY8824X=m
+CONFIG_REGULATOR_SY8827N=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS62360=m
@@ -5231,6 +5265,7 @@ CONFIG_REGULATOR_VCTRL=m
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_REGULATOR_VQMMC_IPQ4019=m
 CONFIG_REGULATOR_WM8994=m
+CONFIG_REGULATOR_QCOM_LABIBB=m
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_LIRC=y
@@ -5270,12 +5305,14 @@ CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 # CONFIG_IR_SIR is not set
 CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
 CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 # CONFIG_MEDIA_CEC_RC is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
 CONFIG_CEC_CROS_EC=m
 CONFIG_CEC_MESON_AO=m
 CONFIG_CEC_MESON_G12A_AO=m
@@ -5693,7 +5730,6 @@ CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
-CONFIG_VIDEO_OV2740=m
 CONFIG_VIDEO_OV5640=m
 CONFIG_VIDEO_OV5645=m
 CONFIG_VIDEO_OV5647=m
@@ -5723,6 +5759,7 @@ CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_RDACM20=m
 CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_S5K6A3=m
@@ -5739,6 +5776,7 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_AD5820=m
 CONFIG_VIDEO_AK7375=m
 CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
 CONFIG_VIDEO_DW9807_VCM=m
 # end of Lens drivers
 
@@ -6034,6 +6072,7 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
@@ -6167,7 +6206,6 @@ CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
-CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
 CONFIG_DRM_PANEL_RONBO_RB070D30=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
@@ -6180,6 +6218,7 @@ CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SITRONIX_ST7701=m
+CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL_SONY_ACX424AKP=m
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
@@ -6351,7 +6390,6 @@ CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_HX8357=m
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_DA9052=m
 CONFIG_BACKLIGHT_QCOM_WLED=m
@@ -6515,6 +6553,7 @@ CONFIG_SND_YMFPCI=m
 # HD-Audio
 #
 CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_HDA_HWDEP=y
@@ -6536,6 +6575,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m
@@ -6666,6 +6706,8 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_ODROID=m
 CONFIG_SND_SOC_ARNDALE=m
+CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994=m
+CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_OF is not set
@@ -6700,6 +6742,11 @@ CONFIG_SND_SOC_TEGRA20_I2S=m
 CONFIG_SND_SOC_TEGRA20_SPDIF=m
 CONFIG_SND_SOC_TEGRA30_AHUB=m
 CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA210_AHUB=m
+CONFIG_SND_SOC_TEGRA210_DMIC=m
+CONFIG_SND_SOC_TEGRA210_I2S=m
+CONFIG_SND_SOC_TEGRA186_DSPK=m
+CONFIG_SND_SOC_TEGRA210_ADMAIF=m
 CONFIG_SND_SOC_TEGRA_RT5640=m
 # CONFIG_SND_SOC_TEGRA_WM8753 is not set
 CONFIG_SND_SOC_TEGRA_WM8903=m
@@ -6768,7 +6815,7 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_BD28623=m
-# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_BT_SCO=m
 CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
@@ -6812,6 +6859,8 @@ CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
@@ -7091,8 +7140,8 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
 CONFIG_USB_OTG_FSM=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_AUTOSUSPEND_DELAY=2
@@ -7574,6 +7623,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
 CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 
 #
@@ -7587,6 +7637,7 @@ CONFIG_LEDS_AW2013=m
 # CONFIG_LEDS_BCM6358 is not set
 CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_EL15203000=m
+CONFIG_LEDS_TURRIS_OMNIA=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3532=m
 # CONFIG_LEDS_LM3642 is not set
@@ -7597,6 +7648,7 @@ CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
@@ -7661,6 +7713,13 @@ CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# end of Speakup console speech
+
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
@@ -7869,6 +7928,7 @@ CONFIG_STM32_MDMA=y
 CONFIG_TEGRA20_APB_DMA=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
+CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_QCOM_BAM_DMA=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -8038,13 +8098,6 @@ CONFIG_AD9834=m
 # end of IIO staging drivers
 
 # CONFIG_FB_SM750 is not set
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# end of Speakup console speech
-
 CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
@@ -8070,10 +8123,6 @@ CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_TEGRA_VDE=m
 CONFIG_VIDEO_TEGRA=m
-
-#
-# soc_camera sensor drivers
-#
 CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_USBVISION=m
@@ -8087,7 +8136,6 @@ CONFIG_VIDEO_USBVISION=m
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -8121,8 +8169,6 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 CONFIG_FB_TFT_WATTEROTT=m
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
 CONFIG_MOST_COMPONENTS=m
 # CONFIG_MOST_CDEV is not set
 # CONFIG_MOST_NET is not set
@@ -8130,12 +8176,12 @@ CONFIG_MOST_COMPONENTS=m
 # CONFIG_MOST_VIDEO is not set
 # CONFIG_MOST_DIM2 is not set
 # CONFIG_MOST_I2C is not set
-# CONFIG_MOST_USB is not set
 # CONFIG_KS7010 is not set
 CONFIG_BCM_VIDEOCORE=m
 CONFIG_BCM2835_VCHIQ=m
 CONFIG_SND_BCM2835=m
 CONFIG_VIDEO_BCM2835=m
+CONFIG_BCM2835_VCHIQ_MMAL=m
 # CONFIG_PI433 is not set
 
 #
@@ -8213,6 +8259,7 @@ CONFIG_COMMON_CLK_MMP2=y
 CONFIG_COMMON_CLK_MMP2_AUDIO=m
 CONFIG_COMMON_CLK_BD718XX=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+CONFIG_CLK_BCM2711_DVP=m
 CONFIG_CLK_BCM2835=y
 CONFIG_CLK_RASPBERRYPI=y
 CONFIG_MXC_CLK=y
@@ -8240,6 +8287,8 @@ CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_APSS_PLL=m
+CONFIG_IPQ_APSS_6018=m
 # CONFIG_IPQ_GCC_4019 is not set
 CONFIG_IPQ_GCC_6018=m
 # CONFIG_IPQ_GCC_806X is not set
@@ -8264,6 +8313,7 @@ CONFIG_MSM_MMCC_8998=m
 CONFIG_QCS_GCC_404=m
 CONFIG_SC_DISPCC_7180=m
 CONFIG_SC_GCC_7180=m
+CONFIG_SC_LPASS_CORECC_7180=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_MSS_7180=m
 CONFIG_SC_VIDEOCC_7180=m
@@ -8278,6 +8328,8 @@ CONFIG_QCS_Q6SSTOP_404=m
 # CONFIG_SDM_LPASSCC_845 is not set
 CONFIG_SM_GCC_8150=m
 CONFIG_SM_GCC_8250=m
+CONFIG_SM_GPUCC_8150=m
+CONFIG_SM_GPUCC_8250=m
 CONFIG_SPMI_PMIC_CLKDIV=m
 CONFIG_QCOM_HFPLL=m
 CONFIG_KPSS_XCC=m
@@ -8328,6 +8380,7 @@ CONFIG_TEGRA_TIMER=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_CLKSRC_STM32=y
+# CONFIG_CLKSRC_STM32_LP is not set
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
@@ -8395,6 +8448,7 @@ CONFIG_QCOM_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
+# CONFIG_REMOTEPROC_CDEV is not set
 CONFIG_IMX_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 # CONFIG_OMAP_REMOTEPROC_WATCHDOG is not set
@@ -8476,6 +8530,7 @@ CONFIG_QCOM_MDT_LOADER=m
 # CONFIG_QCOM_OCMEM is not set
 CONFIG_QCOM_QMI_HELPERS=m
 CONFIG_QCOM_RMTFS_MEM=m
+# CONFIG_QCOM_RPMH is not set
 CONFIG_QCOM_RPMPD=m
 # CONFIG_QCOM_SMEM is not set
 CONFIG_QCOM_SMD_RPM=m
@@ -8492,6 +8547,7 @@ CONFIG_EXYNOS_CHIPID=y
 CONFIG_EXYNOS_PMU=y
 CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
 CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_EXYNOS_REGULATOR_COUPLER=y
 CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
@@ -8564,6 +8620,7 @@ CONFIG_TI_EMIF_SRAM=m
 CONFIG_MVEBU_DEVBUS=y
 CONFIG_FSL_IFC=y
 CONFIG_PL353_SMC=m
+CONFIG_STM32_FMC2_EBI=m
 CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS5422_DMC=m
 CONFIG_EXYNOS_SROM=y
@@ -8600,6 +8657,7 @@ CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMA400=m
 CONFIG_BMA400_I2C=m
+CONFIG_BMA400_SPI=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
@@ -8741,6 +8799,9 @@ CONFIG_BME680_SPI=m
 CONFIG_CCS811=m
 # CONFIG_IAQCORE is not set
 CONFIG_PMS7003=m
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+# CONFIG_SCD30_SERIAL is not set
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 # CONFIG_VZ89X is not set
@@ -8895,6 +8956,9 @@ CONFIG_FXOS8700=m
 CONFIG_FXOS8700_I2C=m
 CONFIG_FXOS8700_SPI=m
 # CONFIG_KMX61 is not set
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 # CONFIG_INV_MPU6050_SPI is not set
@@ -9224,13 +9288,12 @@ CONFIG_PHY_QCOM_IPQ4019_USB=m
 # CONFIG_PHY_QCOM_PCIE2 is not set
 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_SNPS_FEMTO_V2=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS_28NM=m
 CONFIG_PHY_QCOM_USB_SS=m
+CONFIG_PHY_QCOM_IPQ806X_USB=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
@@ -9242,6 +9305,7 @@ CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
+CONFIG_PHY_SAMSUNG_UFS=m
 CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
@@ -9363,7 +9427,9 @@ CONFIG_STM32_TIMER_CNT=m
 CONFIG_STM32_LPTIMER_CNT=m
 CONFIG_TI_EQEP=m
 CONFIG_FTM_QUADDEC=m
+CONFIG_MICROCHIP_TCB_CAPTURE=m
 CONFIG_MOST=m
+CONFIG_MOST_USB_HDM=m
 # end of Device Drivers
 
 #
@@ -9436,6 +9502,7 @@ CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=y
+# CONFIG_FS_ENCRYPTION_INLINE_CRYPT is not set
 CONFIG_FS_VERITY=y
 # CONFIG_FS_VERITY_DEBUG is not set
 CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
@@ -9651,6 +9718,7 @@ CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_SCSILAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
 CONFIG_NFSD_V4_SECURITY_LABEL=y
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
@@ -10179,6 +10247,7 @@ CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
@@ -10194,6 +10263,7 @@ CONFIG_INTERVAL_TREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_DMA_DECLARE_COHERENT=y
@@ -10249,6 +10319,8 @@ CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines
 
+CONFIG_PLDMFW=y
+
 #
 # Kernel hacking
 #
@@ -10290,6 +10362,9 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
@@ -10329,7 +10404,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_HIGHMEM=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-CONFIG_KASAN_STACK=1
 # end of Memory Debugging
 
 CONFIG_DEBUG_SHIRQ=y
@@ -10399,6 +10473,7 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_TORTURE_TEST=m
 # CONFIG_RCU_PERF_TEST is not set
 CONFIG_RCU_TORTURE_TEST=m
+CONFIG_RCU_REF_SCALE_TEST=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
@@ -10529,12 +10604,14 @@ CONFIG_TEST_VMALLOC=m
 CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_LIST_KUNIT_TEST=m
 CONFIG_LINEAR_RANGES_TEST=m
+CONFIG_BITS_TEST=m
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_MEMCAT_P=m
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
+CONFIG_TEST_FREE_PAGES=m
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/config/sources/families/imx6.conf b/config/sources/families/imx6.conf
index c80879166..e649df7d2 100644
--- a/config/sources/families/imx6.conf
+++ b/config/sources/families/imx6.conf
@@ -5,7 +5,7 @@ SERIALCON=ttymxc0
 ARCH=armhf
 UBOOT_TARGET_MAP=';;SPL:SPL.sdhc u-boot.img:u-boot.img.sdhc'
 
-KERNELBRANCH='branch:linux-5.8.y'
+KERNELBRANCH='branch:linux-5.9.y'
 
 case $BOARD in