]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/blobdiff - kernel/config-arm32-generic
kernel: update to 4.12.4
[people/arne_f/ipfire-3.x.git] / kernel / config-arm32-generic
index 9f6302eaba0c6ab14ceae154cc4ebc6580db473a..5ec6fcd90334e505d88bbe80e8d884eb22075d66 100644 (file)
@@ -6,7 +6,6 @@ CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_NO_IOPORT_MAP=y
 CONFIG_ARCH_HAS_BANDGAP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 
@@ -23,13 +22,12 @@ CONFIG_KERNEL_XZ=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_NMI_LOG_BUF_SHIFT=13
 CONFIG_PRINTK_NMI=y
+CONFIG_PERF_USE_VMALLOC=y
 
 #
 # Kernel Performance Events And Counters
 #
-# CONFIG_KPROBES is not set
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_REL=y
@@ -37,6 +35,8 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_BITS=16
 CONFIG_OLD_SIGACTION=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 
 #
 # GCOV-based kernel profiling
@@ -47,8 +47,6 @@ CONFIG_LBDAF=y
 # System Type
 #
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
@@ -93,11 +91,12 @@ CONFIG_ARCH_BCM_5301X=y
 #
 # CONFIG_ARCH_BCM_281XX is not set
 # CONFIG_ARCH_BCM_21664 is not set
+# CONFIG_ARCH_BCM_23550 is not set
 
 #
 # Other Architectures
 #
-# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCM_53573 is not set
 CONFIG_ARCH_BCM_63XX=y
 CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_BERLIN=y
@@ -155,9 +154,6 @@ CONFIG_ARCH_OMAP=y
 #
 # CONFIG_POWER_AVS_OMAP is not set
 # CONFIG_OMAP_RESET_CLOCKS is not set
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 CONFIG_OMAP_DM_TIMER=y
@@ -189,10 +185,8 @@ CONFIG_OMAP_PACKAGE_CBB=y
 #
 # OMAP Legacy Platform Data Board Type
 #
-CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_NOKIA_RX51=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP5_ERRATA_801819=y
 # CONFIG_ARCH_MMP is not set
@@ -200,6 +194,7 @@ CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_MSM8X60 is not set
 # CONFIG_ARCH_MSM8960 is not set
 # CONFIG_ARCH_MSM8974 is not set
+# CONFIG_ARCH_MDM9615 is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SOCFPGA is not set
@@ -221,7 +216,6 @@ CONFIG_ARCH_EXYNOS5=y
 CONFIG_CPU_EXYNOS4210=y
 CONFIG_SOC_EXYNOS4212=y
 CONFIG_SOC_EXYNOS4412=y
-CONFIG_SOC_EXYNOS4415=y
 CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5260=y
 CONFIG_SOC_EXYNOS5410=y
@@ -272,7 +266,6 @@ CONFIG_ARCH_VEXPRESS_SPC=y
 CONFIG_ARCH_VEXPRESS_TC2_PM=y
 CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8850=y
-# CONFIG_ARCH_ZX is not set
 CONFIG_ARCH_ZYNQ=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARCH_SUPPORTS_FIRMWARE=y
@@ -287,6 +280,7 @@ CONFIG_TRUSTED_FOUNDATIONS=y
 # Processor Type
 #
 CONFIG_CPU_V7=y
+CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV7=y
@@ -316,6 +310,7 @@ CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
+# CONFIG_CACHE_L2X0_PMU is not set
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_PL310_ERRATA_753970=y
@@ -336,22 +331,38 @@ CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 # CONFIG_ARM_ERRATA_773022 is not set
-CONFIG_ICST=y
+# CONFIG_ARM_ERRATA_818325_852422 is not set
+# CONFIG_ARM_ERRATA_821420 is not set
+# CONFIG_ARM_ERRATA_825619 is not set
+# CONFIG_ARM_ERRATA_852421 is not set
+# CONFIG_ARM_ERRATA_852423 is not set
 
 #
-# PCI host controller drivers
+# DesignWare PCI Core Support
 #
 CONFIG_PCI_EXYNOS=y
 CONFIG_PCI_IMX6=y
-CONFIG_PCI_TEGRA=y
 CONFIG_PCI_KEYSTONE=y
-CONFIG_PCIE_XILINX=y
 CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCIE_QCOM=y
+
+#
+# PCI host controller drivers
+#
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCIE_XILINX=y
 CONFIG_PCIE_IPROC=m
 CONFIG_PCIE_IPROC_PLATFORM=m
 # CONFIG_PCIE_IPROC_BCMA is not set
+CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCIE_ALTERA=y
-CONFIG_PCIE_QCOM=y
+# CONFIG_PCIE_ALTERA_MSI is not set
+# CONFIG_PCIE_ROCKCHIP is not set
+
+#
+# PCI switch controller drivers
+#
 # CONFIG_PCCARD is not set
 
 #
@@ -371,8 +382,12 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=4
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
-CONFIG_HZ_FIXED=200
-CONFIG_HZ=200
+CONFIG_HZ_FIXED=0
+CONFIG_HZ_100=y
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_500 is not set
+CONFIG_HZ=100
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
 CONFIG_ARM_ASM_UNIFIED=y
@@ -405,7 +420,6 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_KEXEC is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_EFI is not set
@@ -413,16 +427,19 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU frequency scaling drivers
 #
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
+# CONFIG_ARM_BRCMSTB_AVS_CPUFREQ_DEBUG is not set
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
+CONFIG_ARM_DB8500_CPUFREQ=y
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-CONFIG_QORIQ_CPUFREQ=m
+# CONFIG_ARM_TI_CPUFREQ is not set
 
 #
 # ARM CPU Idle Drivers
@@ -441,6 +458,11 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
 
+#
+# Userspace binary formats
+#
+# CONFIG_BINFMT_FLAT is not set
+
 #
 # Power management options
 #
@@ -471,16 +493,16 @@ CONFIG_BRCMSTB_GISB_ARB=y
 # CONFIG_IMX_WEIM is not set
 CONFIG_OMAP_INTERCONNECT=y
 # CONFIG_OMAP_OCP2SCP is not set
+CONFIG_QCOM_EBI2=y
 CONFIG_SUNXI_RSB=m
-CONFIG_OF_DYNAMIC=y
+CONFIG_TEGRA_GMI=m
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_MG_DISK is not set
 
 #
 # Misc devices
 #
 # CONFIG_QCOM_COINCELL is not set
-# CONFIG_ARM_CHARLCD is not set
+CONFIG_SRAM_EXEC=y
 
 #
 # VOP Driver
@@ -496,7 +518,8 @@ CONFIG_SCSI_NSP32=m
 #
 # Controllers with non-SFF native interface
 #
-CONFIG_AHCI_BRCMSTB=m
+CONFIG_AHCI_BRCM=m
+CONFIG_AHCI_DM816=m
 CONFIG_AHCI_ST=m
 CONFIG_AHCI_IMX=m
 CONFIG_AHCI_SUNXI=m
@@ -517,8 +540,12 @@ CONFIG_PATA_IMX=m
 #
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
+CONFIG_ARC_EMAC_CORE=m
+CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_MACB is not set
-CONFIG_BGMAC=m
+CONFIG_BGMAC=y
+CONFIG_BGMAC_BCMA=m
+CONFIG_BGMAC_PLATFORM=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
@@ -533,12 +560,17 @@ CONFIG_FEC=m
 CONFIG_FSL_PQ_MDIO=m
 CONFIG_FSL_XGMAC_MDIO=m
 CONFIG_GIANFAR=m
+# CONFIG_MVNETA_BM is not set
 CONFIG_PXA168_ETH=m
 CONFIG_NET_VENDOR_MEDIATEK=y
 CONFIG_NET_MEDIATEK_SOC=m
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC911X=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_STI=m
+CONFIG_DWMAC_SUNXI=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
@@ -547,12 +579,15 @@ CONFIG_TI_CPSW=m
 # CONFIG_TI_CPTS is not set
 CONFIG_NET_VENDOR_XILINX=y
 # CONFIG_XILINX_EMACLITE is not set
+CONFIG_MDIO_BCM_IPROC=m
+CONFIG_MDIO_BUS_MUX=y
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
+CONFIG_MDIO_SUN4I=m
 
 #
-# MII PHY device drivers
+# Enable WiMAX (Networking options) to see the WiMAX drivers
 #
-CONFIG_MDIO_SUN4I=m
-CONFIG_MDIO_BCM_IPROC=m
+CONFIG_VMXNET3=m
 
 #
 # Input device support
@@ -580,6 +615,7 @@ CONFIG_INPUT_PM8941_PWRKEY=m
 # CONFIG_INPUT_PM8XXX_VIBRATOR is not set
 CONFIG_INPUT_PMIC8XXX_PWRKEY=m
 CONFIG_INPUT_SIRFSOC_ONKEY=y
+CONFIG_INPUT_HISI_POWERKEY=m
 
 #
 # Hardware I/O ports
@@ -605,26 +641,19 @@ CONFIG_SERIAL_IMX=m
 # CONFIG_SERIAL_VT8500 is not set
 CONFIG_SERIAL_OMAP=m
 CONFIG_SERIAL_BCM63XX=m
-# CONFIG_SERIAL_MPS2_UART is not set
 CONFIG_SERIAL_ST_ASC=m
-CONFIG_SERIAL_STM32=m
 CONFIG_SERIAL_MCTRL_GPIO=m
 # CONFIG_HVC_DCC is not set
+CONFIG_HW_RANDOM_BCM2835=y
 CONFIG_HW_RANDOM_IPROC_RNG200=m
 CONFIG_HW_RANDOM_OMAP=y
 CONFIG_HW_RANDOM_OMAP3_ROM=y
-CONFIG_HW_RANDOM_EXYNOS=y
 CONFIG_HW_RANDOM_HISI=y
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_ST=m
+CONFIG_HW_RANDOM_MTK=y
 CONFIG_NVRAM=y
 
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_DEMUX_PINCTRL=m
-
 #
 # PC SMBus host controller drivers
 #
@@ -639,6 +668,7 @@ CONFIG_I2C_BCM_IPROC=m
 CONFIG_I2C_DAVINCI=m
 CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_IMX=m
+CONFIG_I2C_IMX_LPI2C=m
 CONFIG_I2C_MT65XX=m
 CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_NOMADIK=y
@@ -672,21 +702,11 @@ CONFIG_PPS=y
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_GIANFAR=m
 
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PINCTRL=y
-
 #
 # Pin controllers
 #
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
-CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SIRF=y
@@ -720,8 +740,10 @@ CONFIG_PINCTRL_IPQ4019=y
 CONFIG_PINCTRL_IPQ8064=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MDM9615=m
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_MSM8994=m
 CONFIG_PINCTRL_MSM8996=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
@@ -730,10 +752,8 @@ CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN4I_A10=y
-CONFIG_PINCTRL_SUN5I_A10S=y
-CONFIG_PINCTRL_SUN5I_A13=y
+CONFIG_PINCTRL_SUN5I=y
 CONFIG_PINCTRL_SUN6I_A31=y
-CONFIG_PINCTRL_SUN6I_A31S=y
 CONFIG_PINCTRL_SUN6I_A31_R=y
 CONFIG_PINCTRL_SUN7I_A20=y
 CONFIG_PINCTRL_SUN8I_A23=y
@@ -742,17 +762,21 @@ CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_A23_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
 CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_PINCTRL_SUN9I_A80_R=y
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_TI_IODELAY=m
 # CONFIG_PINCTRL_WM8850 is not set
 CONFIG_PINCTRL_MTK=y
-# CONFIG_PINCTRL_MT2701 is not set
 CONFIG_PINCTRL_MT7623=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
@@ -765,7 +789,6 @@ CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIO_BRCMSTB=m
 # CONFIG_GPIO_DAVINCI is not set
 # CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
@@ -775,11 +798,21 @@ CONFIG_GPIO_VF610=y
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_GPIO_ZYNQ=m
 
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_TS4900=m
+
+#
+# MFD GPIO expanders
+#
+# CONFIG_HTC_EGPIO is not set
+
 #
 # USB GPIO expanders
 #
-# CONFIG_APM_POWER is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
+# CONFIG_ROCKCHIP_IODOMAIN is not set
+CONFIG_POWER_RESET_BRCMKONA=y
 CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_IMX=y
@@ -787,21 +820,27 @@ CONFIG_POWER_RESET_IMX=y
 CONFIG_POWER_RESET_ST=y
 CONFIG_POWER_RESET_VERSATILE=y
 CONFIG_POWER_RESET_KEYSTONE=y
-# CONFIG_ROCKCHIP_IODOMAIN is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
 
 #
 # Native drivers
 #
 # CONFIG_HISI_THERMAL is not set
+CONFIG_IMX_THERMAL=m
 CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DB8500_THERMAL=y
-CONFIG_DB8500_CPUFREQ_COOLING=y
 
 #
 # ACPI INT340X thermal drivers
 #
 CONFIG_MTK_THERMAL=m
 
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM_NS_THERMAL=y
+
 #
 # Texas Instruments thermal drivers
 #
@@ -824,6 +863,11 @@ CONFIG_ST_THERMAL_MEMMAP=m
 #
 CONFIG_TEGRA_SOCTHERM=m
 
+#
+# Qualcomm thermal drivers
+#
+CONFIG_QCOM_TSENS=m
+
 #
 # Watchdog Device Drivers
 #
@@ -850,13 +894,14 @@ CONFIG_SSB_HOST_SOC=y
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_AC100=m
 CONFIG_MFD_AXP20X_RSB=m
 # CONFIG_MFD_ASIC3 is not set
+CONFIG_MFD_EXYNOS_LPASS=m
 CONFIG_MFD_HI655X_PMIC=m
-# CONFIG_HTC_EGPIO is not set
 CONFIG_MFD_PM8XXX=m
-CONFIG_MFD_PM8921_CORE=m
 CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_ABX500_CORE=y
@@ -890,6 +935,8 @@ CONFIG_REGULATOR_TWL4030=y
 #
 # Media drivers
 #
+CONFIG_IR_MTK=m
+CONFIG_IR_RX51=m
 # CONFIG_RC_ST is not set
 CONFIG_IR_SUNXI=m
 
@@ -899,15 +946,24 @@ CONFIG_IR_SUNXI=m
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
 # CONFIG_VIDEO_AM437X_VPFE is not set
 # CONFIG_VIDEO_TI_CAL is not set
 # CONFIG_VIDEO_CODA is not set
+# CONFIG_VIDEO_IMX_VDOA is not set
+# CONFIG_VIDEO_MEDIATEK_JPEG is not set
+CONFIG_VIDEO_MEDIATEK_VPU=m
+CONFIG_VIDEO_MEDIATEK_MDP=m
+CONFIG_VIDEO_MEDIATEK_VCODEC=m
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 CONFIG_VIDEO_STI_BDISP=m
+CONFIG_VIDEO_STI_HVA=m
+# CONFIG_VIDEO_STI_HVA_DEBUGFS is not set
+CONFIG_VIDEO_STI_DELTA=m
+CONFIG_VIDEO_STI_DELTA_MJPEG=y
+CONFIG_VIDEO_STI_DELTA_DRIVER=m
 # CONFIG_VIDEO_TI_VPE is not set
 CONFIG_DVB_C8SECTPFE=m
 
@@ -951,18 +1007,18 @@ CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_IPP=y
 # CONFIG_DRM_EXYNOS_FIMC is not set
 # CONFIG_DRM_EXYNOS_ROTATOR is not set
-CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_ROCKCHIP=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
-CONFIG_ROCKCHIP_INNO_HDMI=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_OMAP2_DSS_INIT=y
+CONFIG_OMAP_DSS_BASE=m
 CONFIG_OMAP2_DSS=m
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
@@ -979,15 +1035,15 @@ CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 #
 # OMAPDRM External Display Device Drivers
 #
-# CONFIG_DISPLAY_ENCODER_OPA362 is not set
-# CONFIG_DISPLAY_ENCODER_TFP410 is not set
-# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
-# CONFIG_DISPLAY_CONNECTOR_DVI is not set
-# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
-# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
-# CONFIG_DISPLAY_PANEL_DPI is not set
-# CONFIG_DISPLAY_PANEL_DSI_CM is not set
-# CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01 is not set
+CONFIG_DRM_OMAP_ENCODER_OPA362=m
+CONFIG_DRM_OMAP_ENCODER_TFP410=m
+CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
+CONFIG_DRM_OMAP_CONNECTOR_DVI=m
+CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
+CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
+CONFIG_DRM_OMAP_PANEL_DPI=m
+CONFIG_DRM_OMAP_PANEL_DSI_CM=m
+CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -997,6 +1053,7 @@ CONFIG_DRM_MSM_DSI_PLL=y
 CONFIG_DRM_MSM_DSI_28NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
 CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -1004,14 +1061,13 @@ CONFIG_DRM_TEGRA=m
 #
 # Display Interface Bridges
 #
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_ETNAVIV=m
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 CONFIG_DRM_MEDIATEK=m
+CONFIG_DRM_MEDIATEK_HDMI=m
 
 #
 # Frame buffer hardware drivers
@@ -1024,14 +1080,6 @@ CONFIG_DRM_MEDIATEK=m
 # CONFIG_FB_DA8XX is not set
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_MXS is not set
-CONFIG_EXYNOS_VIDEO=y
-# CONFIG_EXYNOS_MIPI_DSI is not set
-
-#
-# Console display driver support
-#
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
 
 #
 # HD-Audio
@@ -1040,6 +1088,7 @@ CONFIG_SND_HDA_TEGRA=m
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 # CONFIG_SND_SOC_ADI is not set
+CONFIG_SND_DESIGNWARE_PCM=y
 
 #
 # Common SoC Audio options for Freescale CPUs:
@@ -1059,6 +1108,10 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_MEDIATEK=m
+CONFIG_SND_SOC_MT2701=m
+CONFIG_SND_SOC_MT2701_CS42448=m
+CONFIG_SND_SOC_MT2701_WM8960=m
+CONFIG_SND_SOC_MT8173=m
 CONFIG_SND_SOC_MT8173_MAX98090=m
 CONFIG_SND_SOC_MT8173_RT5650=m
 CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
@@ -1075,6 +1128,7 @@ CONFIG_SND_SOC_ROCKCHIP_I2S=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SAMSUNG_PCM=m
 CONFIG_SND_SAMSUNG_SPDIF=m
@@ -1083,7 +1137,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
-CONFIG_SND_SOC_ODROIDX2=m
+CONFIG_SND_SOC_ODROID=m
 CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_SIRF=m
 CONFIG_SND_SOC_SIRF_AUDIO=m
@@ -1094,6 +1148,11 @@ CONFIG_SND_SOC_STI=m
 #
 # Allwinner SoC Audio support
 #
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN8I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
@@ -1102,8 +1161,6 @@ CONFIG_SND_SOC_XTFPGA_I2S=m
 # CODEC drivers
 #
 CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX98357A=m
@@ -1130,6 +1187,13 @@ CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
 CONFIG_USB_UHCI_PLATFORM=y
 CONFIG_USB_IMX21_HCD=y
 
+#
+# USB Imaging devices
+#
+CONFIG_USB_MTU3=m
+CONFIG_USB_MTU3_HOST=y
+# CONFIG_USB_MTU3_DEBUG is not set
+
 #
 # Platform Glue Layer
 #
@@ -1170,6 +1234,7 @@ CONFIG_USB_MXS_PHY=m
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
@@ -1186,17 +1251,24 @@ CONFIG_MMC_MXC=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_WMT=y
 CONFIG_MMC_SUNXI=m
+CONFIG_MMC_SDHCI_BRCMSTB=m
 
 #
-# LED drivers
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
-CONFIG_LEDS_AAT1290=m
+CONFIG_LEDS_PM8058=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
 CONFIG_EDAC_ATOMIC_SCRUB=y
 # CONFIG_EDAC is not set
+CONFIG_RTC_MC146818_LIB=y
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_AC100=m
 
 #
 # Platform RTC drivers
@@ -1211,7 +1283,7 @@ CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_OMAP=m
 CONFIG_RTC_DRV_S3C=m
 # CONFIG_RTC_DRV_VT8500 is not set
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_TEGRA=m
@@ -1235,11 +1307,17 @@ CONFIG_MX3_IPU_IRQS=4
 CONFIG_NBPFAXI_DMA=m
 # CONFIG_SIRF_DMA is not set
 # CONFIG_STE_DMA40 is not set
+CONFIG_ST_FDMA=m
 # CONFIG_TEGRA20_APB_DMA is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_TI_EDMA is not set
 # CONFIG_QCOM_BAM_DMA is not set
 
+#
+# DMABUF options
+#
+# CONFIG_ARM_CHARLCD is not set
+
 #
 # Microsoft Hyper-V guest support
 #
@@ -1248,16 +1326,36 @@ CONFIG_CHROME_PLATFORMS=y
 #
 # Common Clock Framework
 #
+CONFIG_ICST=y
+CONFIG_COMMON_CLK_HI655X=m
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_CLK_BCM_63XX=y
 CONFIG_COMMON_CLK_IPROC=y
+CONFIG_CLK_BCM_NSP=y
+CONFIG_CLK_BCM_NS2=y
+CONFIG_COMMON_CLK_HI3516CV300=y
 CONFIG_COMMON_CLK_HI3519=y
+CONFIG_COMMON_CLK_HI3660=y
+CONFIG_COMMON_CLK_HI3798CV200=y
 CONFIG_COMMON_CLK_HI6220=y
 CONFIG_RESET_HISI=y
 CONFIG_STUB_CLK_HI6220=y
+CONFIG_COMMON_CLK_MEDIATEK=y
+CONFIG_COMMON_CLK_MT2701=y
+# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
+# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
+# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
+# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
+CONFIG_COMMON_CLK_MT8135=y
+CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_QCOM_CLK_RPM is not set
+# CONFIG_QCOM_CLK_SMD_RPM is not set
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_IPQ_GCC_4019=m
@@ -1267,12 +1365,36 @@ CONFIG_MSM_GCC_8660=m
 CONFIG_MSM_GCC_8916=m
 CONFIG_MSM_GCC_8960=m
 CONFIG_MSM_LCC_8960=m
+CONFIG_MDM_GCC_9615=m
+CONFIG_MDM_LCC_9615=m
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_GCC_8974=m
 CONFIG_MSM_MMCC_8974=m
+CONFIG_MSM_GCC_8994=m
 CONFIG_MSM_GCC_8996=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUNXI_CCU_DIV=y
+CONFIG_SUNXI_CCU_FRAC=y
+CONFIG_SUNXI_CCU_GATE=y
+CONFIG_SUNXI_CCU_MUX=y
+CONFIG_SUNXI_CCU_MULT=y
+CONFIG_SUNXI_CCU_PHASE=y
+CONFIG_SUNXI_CCU_NK=y
+CONFIG_SUNXI_CCU_NKM=y
+CONFIG_SUNXI_CCU_NKMP=y
+CONFIG_SUNXI_CCU_NM=y
+CONFIG_SUNXI_CCU_MP=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_COMMON_CLK_TI_ADPLL=m
 CONFIG_HWSPINLOCK=m
@@ -1299,6 +1421,9 @@ CONFIG_VT8500_TIMER=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_NOMADIK_MTU=y
 CONFIG_CLKSRC_DBX500_PRCMU=y
+CONFIG_ATLAS7_TIMER=y
+CONFIG_PRIMA2_TIMER=y
+CONFIG_KEYSTONE_TIMER=y
 CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_GLOBAL_TIMER=y
@@ -1306,7 +1431,6 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_EXYNOS_MCT=y
 CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_MTK_TIMER=y
-CONFIG_CLKSRC_VERSATILE=y
 CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_CLKSRC_ST_LPC=y
 CONFIG_PL320_MBOX=y
@@ -1316,6 +1440,7 @@ CONFIG_ROCKCHIP_MBOX=y
 CONFIG_STI_MBOX=m
 CONFIG_TI_MESSAGE_MANAGER=m
 CONFIG_HI6220_MBOX=m
+CONFIG_BCM_PDC_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
@@ -1328,6 +1453,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_EXYNOS_IOMMU is not set
 CONFIG_ARM_SMMU=y
 CONFIG_MTK_IOMMU=y
+CONFIG_MTK_IOMMU_V1=y
 
 #
 # Remoteproc drivers
@@ -1335,39 +1461,59 @@ CONFIG_MTK_IOMMU=y
 CONFIG_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=m
+CONFIG_QCOM_ADSP_PIL=m
+CONFIG_QCOM_RPROC_COMMON=m
+CONFIG_QCOM_Q6V5_PIL=m
+CONFIG_QCOM_WCNSS_PIL=m
 CONFIG_ST_REMOTEPROC=m
+CONFIG_ST_SLIM_REMOTEPROC=m
 
 #
 # Rpmsg drivers
 #
 CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_QCOM_SMD=m
+CONFIG_RPMSG_VIRTIO=m
 
 #
-# SOC (System On Chip) specific Drivers
+# Broadcom SoC drivers
 #
 CONFIG_SOC_BRCMSTB=y
+CONFIG_FSL_GUTS=y
+
+#
+# i.MX SoC drivers
+#
 # CONFIG_MTK_INFRACFG is not set
 # CONFIG_MTK_PMIC_WRAP is not set
 # CONFIG_MTK_SCPSYS is not set
 CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PM=y
 CONFIG_QCOM_SMEM=m
-CONFIG_QCOM_SMD=m
 CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMP2P is not set
 # CONFIG_QCOM_SMSM is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
+CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
 CONFIG_EXYNOS_PMU=y
+CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
+CONFIG_EXYNOS_PM_DOMAINS=y
 CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
 # CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set
 CONFIG_KEYSTONE_NAVIGATOR_DMA=m
 CONFIG_WKUP_M3_IPC=m
+CONFIG_TI_SCI_PM_DOMAINS=m
+CONFIG_UX500_SOC_ID=y
 
 #
 # DEVFREQ Governors
@@ -1380,8 +1526,10 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y
 #
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
 
 #
 # Extcon Device Drivers
@@ -1400,10 +1548,15 @@ CONFIG_TEGRA124_EMC=y
 #
 # Analog to digital converters
 #
+CONFIG_BCM_IPROC_ADC=m
 # CONFIG_BERLIN2_ADC is not set
 # CONFIG_EXYNOS_ADC is not set
 CONFIG_IMX7D_ADC=m
+CONFIG_MEDIATEK_MT6577_AUXADC=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_ROCKCHIP_SARADC=m
+CONFIG_SUN4I_GPADC=m
 # CONFIG_XILINX_XADC is not set
 
 #
@@ -1411,10 +1564,13 @@ CONFIG_ROCKCHIP_SARADC=m
 #
 # CONFIG_PWM_AB8500 is not set
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
+CONFIG_PWM_BCM_IPROC=y
 CONFIG_PWM_BERLIN=m
 CONFIG_PWM_BRCMSTB=m
+CONFIG_PWM_HIBVT=m
 # CONFIG_PWM_IMX is not set
 # CONFIG_PWM_MTK_DISP is not set
+CONFIG_PWM_MEDIATEK=m
 CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_ROCKCHIP=m
 # CONFIG_PWM_SAMSUNG is not set
@@ -1433,22 +1589,24 @@ CONFIG_ST_IRQCHIP=y
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_BERLIN=y
+CONFIG_RESET_SUNXI=y
+CONFIG_RESET_ZYNQ=y
 CONFIG_STI_RESET_SYSCFG=y
-CONFIG_STIH415_RESET=y
-CONFIG_STIH416_RESET=y
 CONFIG_STIH407_RESET=y
+CONFIG_COMMON_RESET_HI3660=y
 CONFIG_COMMON_RESET_HI6220=m
 
 #
 # PHY Subsystem
 #
 CONFIG_PHY_BCM_NS_USB2=m
+CONFIG_PHY_BCM_NS_USB3=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_DM816X_USB=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 CONFIG_PHY_MIPHY28LP=m
-CONFIG_PHY_MIPHY365X=m
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TWL4030_USB=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
@@ -1461,35 +1619,54 @@ CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
 CONFIG_PHY_EXYNOS5250_USB2=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_STIH407_USB=m
-CONFIG_PHY_STIH41X_USB=m
+CONFIG_PHY_QCOM_QMP=m
+CONFIG_PHY_QCOM_QUSB2=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_BRCM_SATA=y
 CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_NS2_PCIE=y
 
 #
 # Android
 #
+CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_VF610_OCOTP=m
 
+#
+# FSI support
+#
+# CONFIG_TEE is not set
+
 #
 # Firmware Drivers
 #
 CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_32=y
+CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_BCM47XX_NVRAM=y
 # CONFIG_BCM47XX_SPROM is not set
 
+#
+# Tegra firmware driver
+#
+# CONFIG_TEGRA_IVC is not set
+
 #
 # Pseudo filesystems
 #
@@ -1500,11 +1677,6 @@ CONFIG_PROC_VMCORE=y
 #
 # CONFIG_DEBUG_HIGHMEM is not set
 
-#
-# RCU Debugging
-#
-# CONFIG_UPROBE_EVENT is not set
-
 #
 # Runtime Testing
 #
@@ -1518,11 +1690,6 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ENGINE=m
-
 #
 # Random Number Generation
 #
@@ -1536,21 +1703,25 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_LE=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_MXC_SCC=m
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
 CONFIG_CRYPTO_DEV_MXS_DCP=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_MEDIATEK=m
+CONFIG_CRYPTO_DEV_BCM_SPU=m
 
 #
 # Certificates for signature checking
@@ -1566,6 +1737,8 @@ CONFIG_CRYPTO_AES_ARM=m
 CONFIG_CRYPTO_AES_ARM_BS=m
 CONFIG_CRYPTO_AES_ARM_CE=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
+CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
+CONFIG_CRYPTO_CRC32_ARM_CE=m
 
 #
 # Library routines