]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - kernel/config-arm32-generic
kernel: Update to 5.1
[ipfire-3.x.git] / kernel / config-arm32-generic
index d84721ff98d4000096a6241dc6b8453da069e6dd..54f4a2e69c139f74080fad3a639e2e91f6952bd6 100644 (file)
@@ -1,14 +1,3 @@
-CONFIG_ARM=y
-CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_ARM_DMA_USE_IOMMU=y
-CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
-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
 
 #
 # General setup
@@ -20,33 +9,34 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZ4 is not set
 
 #
-# RCU Subsystem
+# Timers subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
 
 #
-# Kernel Performance Events And Counters
+# RCU Subsystem
 #
-# CONFIG_KPROBES is not set
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_MODULES_USE_ELF_REL=y
-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_PERF_USE_VMALLOC=y
 
 #
-# GCOV-based kernel profiling
+# Kernel Performance Events And Counters
 #
-CONFIG_LBDAF=y
+CONFIG_ARM=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_NO_IOPORT_MAP=y
+CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 
 #
 # System Type
 #
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 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
@@ -72,7 +62,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
-# CONFIG_ARCH_MULTI_CPU_AUTO is not set
 CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -83,6 +72,7 @@ CONFIG_ARCH_BCM=y
 #
 CONFIG_ARCH_BCM_IPROC=y
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_HR2 is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM_5301X=y
 
@@ -91,11 +81,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
@@ -103,6 +94,29 @@ CONFIG_ARCH_BERLIN=y
 # CONFIG_MACH_BERLIN_BG2CD is not set
 # CONFIG_MACH_BERLIN_BG2Q is not set
 # CONFIG_ARCH_DIGICOLOR is not set
+CONFIG_ARCH_EXYNOS=y
+CONFIG_S5P_DEV_MFC=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+
+#
+# EXYNOS SoCs
+#
+CONFIG_CPU_EXYNOS4210=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5800=y
+# CONFIG_EXYNOS5420_MCPM is not set
+CONFIG_EXYNOS_CPU_SUSPEND=y
+CONFIG_PLAT_SAMSUNG=y
+
+#
+# Power management
+#
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
 
@@ -113,10 +127,6 @@ CONFIG_ARCH_HI3xxx=y
 # CONFIG_ARCH_HIP01 is not set
 CONFIG_ARCH_HIP04=y
 CONFIG_ARCH_HIX5HD2=y
-CONFIG_ARCH_KEYSTONE=y
-CONFIG_MACH_MESON6=y
-CONFIG_MACH_MESON8=y
-CONFIG_MACH_MESON8B=y
 CONFIG_ARCH_MXC=y
 
 #
@@ -128,23 +138,33 @@ CONFIG_ARCH_MXC=y
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SLL=y
 CONFIG_SOC_IMX6SX=y
 # CONFIG_SOC_IMX6UL is not set
-# CONFIG_SOC_IMX7D is not set
 # CONFIG_SOC_LS1021A is not set
 
 #
 # Cortex-A/Cortex-M asymmetric multiprocessing platforms
 #
+# CONFIG_SOC_IMX7D is not set
+# CONFIG_SOC_IMX7ULP is not set
 CONFIG_SOC_VF610=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 # CONFIG_VF_USE_PIT_TIMER is not set
+CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MEDIATEK=y
+# CONFIG_MACH_MT2701 is not set
 CONFIG_MACH_MT6589=y
 CONFIG_MACH_MT6592=y
 CONFIG_MACH_MT7623=y
+CONFIG_MACH_MT7629=y
 CONFIG_MACH_MT8127=y
 CONFIG_MACH_MT8135=y
+CONFIG_MACH_MESON6=y
+CONFIG_MACH_MESON8=y
+# CONFIG_ARCH_MILBEAUT is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_NPCM is not set
 CONFIG_ARCH_OMAP=y
 
 #
@@ -152,13 +172,8 @@ 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
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
 
 #
@@ -186,57 +201,35 @@ 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_ARCH_MMP is not set
+CONFIG_OMAP5_ERRATA_801819=y
+CONFIG_ARCH_SIRF=y
+
+#
+# CSR SiRF atlas6/primaII/Atlas7 Specific Features
+#
+CONFIG_ARCH_ATLAS6=y
+CONFIG_ARCH_ATLAS7=y
+CONFIG_ARCH_PRIMA2=y
+CONFIG_SIRF_IRQ=y
 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_RDA is not set
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_ROCKCHIP=y
+# CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_ARCH_STI=y
 CONFIG_SOC_STIH415=y
 CONFIG_SOC_STIH416=y
 CONFIG_SOC_STIH407=y
-# CONFIG_ARCH_S5PV210 is not set
-CONFIG_ARCH_EXYNOS=y
-CONFIG_S5P_DEV_MFC=y
-# CONFIG_ARCH_EXYNOS3 is not set
-CONFIG_ARCH_EXYNOS4=y
-CONFIG_ARCH_EXYNOS5=y
-
-#
-# EXYNOS SoCs
-#
-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
-CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5440=y
-CONFIG_SOC_EXYNOS5800=y
-# CONFIG_EXYNOS5420_MCPM is not set
-CONFIG_EXYNOS_CPU_SUSPEND=y
-CONFIG_PLAT_SAMSUNG=y
-
-#
-# Boot options
-#
-# CONFIG_SAMSUNG_ATAGS is not set
-
-#
-# Power management
-#
-# CONFIG_SAMSUNG_PM_CHECK is not set
+# CONFIG_ARCH_STM32 is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_MACH_SUN5I=y
@@ -244,23 +237,11 @@ CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
-CONFIG_ARCH_SIRF=y
-
-#
-# CSR SiRF atlas6/primaII/Atlas7 Specific Features
-#
-CONFIG_ARCH_ATLAS6=y
-CONFIG_ARCH_ATLAS7=y
-CONFIG_ARCH_PRIMA2=y
-CONFIG_SIRF_IRQ=y
+CONFIG_ARCH_SUNXI_MC_SMP=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
-CONFIG_MACH_MOP500=y
-# CONFIG_MACH_HREFV60 is not set
-# CONFIG_MACH_SNOWBALL is not set
-CONFIG_UX500_AUTO_PLATFORM=y
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
@@ -268,7 +249,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
@@ -283,6 +263,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
@@ -299,19 +280,21 @@ CONFIG_CPU_CP15_MMU=y
 # Processor Features
 #
 # CONFIG_ARM_LPAE is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_CACHE_B15_RAC=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
@@ -322,8 +305,7 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_HEAVY_MB=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_DEBUG_ALIGN_RODATA=y
-CONFIG_MULTI_IRQ_HANDLER=y
-# CONFIG_ARM_ERRATA_430973 is not set
+CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_643719=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_754322=y
@@ -331,24 +313,13 @@ CONFIG_ARM_ERRATA_754327=y
 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
-
-#
-# PCI host controller drivers
-#
-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_IPROC=m
-CONFIG_PCIE_IPROC_PLATFORM=m
-# CONFIG_PCIE_IPROC_BCMA is not set
-CONFIG_PCIE_ALTERA=y
-CONFIG_PCIE_QCOM=y
-# CONFIG_PCCARD is not set
+CONFIG_ARM_ERRATA_773022=y
+CONFIG_ARM_ERRATA_818325_852422=y
+CONFIG_ARM_ERRATA_821420=y
+CONFIG_ARM_ERRATA_825619=y
+CONFIG_ARM_ERRATA_852421=y
+CONFIG_ARM_ERRATA_852423=y
+CONFIG_KRAIT_L2_ACCESSORS=y
 
 #
 # Kernel Features
@@ -367,26 +338,23 @@ 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_200 is not set
+# CONFIG_HZ_500 is not set
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
-CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
+CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ARM_MODULE_PLTS is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_STACKPROTECTOR_PER_TASK=y
 
 #
 # Boot options
@@ -401,7 +369,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
@@ -409,26 +376,27 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU frequency scaling drivers
 #
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
-# CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
-CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
+CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
-CONFIG_ARM_HISI_ACPU_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_ARM_MEDIATEK_CPUFREQ=m
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
-CONFIG_ARM_TEGRA124_CPUFREQ=m
-CONFIG_QORIQ_CPUFREQ=m
+CONFIG_ARM_TEGRA124_CPUFREQ=y
+CONFIG_ARM_TI_CPUFREQ=y
 
 #
 # ARM CPU Idle Drivers
 #
-# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
-# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-# CONFIG_ARM_ZYNQ_CPUIDLE is not set
-# CONFIG_ARM_U8500_CPUIDLE is not set
-# CONFIG_ARM_EXYNOS_CPUIDLE is not set
+CONFIG_ARM_BIG_LITTLE_CPUIDLE=y
+CONFIG_ARM_HIGHBANK_CPUIDLE=y
+CONFIG_ARM_ZYNQ_CPUIDLE=y
+CONFIG_ARM_U8500_CPUIDLE=y
+CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -441,10 +409,74 @@ CONFIG_NEON=y
 #
 # Power management options
 #
-# CONFIG_HIBERNATION is not set
 CONFIG_APM_EMULATION=y
 CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+
+#
+# Firmware Drivers
+#
+CONFIG_QCOM_SCM=y
+CONFIG_QCOM_SCM_32=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_TI_SCI_PROTOCOL=m
+CONFIG_BCM47XX_NVRAM=y
+# CONFIG_BCM47XX_SPROM is not set
+# CONFIG_IMX_SCU is not set
+
+#
+# Tegra firmware driver
+#
+# CONFIG_TEGRA_IVC is not set
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA1_ARM_CE=m
+CONFIG_CRYPTO_SHA2_ARM_CE=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+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
+
+#
+# General architecture-dependent options
+#
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_MMAP_RND_BITS=16
+CONFIG_OLD_SIGACTION=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+CONFIG_LBDAF=y
+
+#
+# Executable file formats
+#
+# CONFIG_BINFMT_ELF_FDPIC is not set
+# CONFIG_BINFMT_FLAT is not set
+
+#
+# Memory Management options
+#
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_BOUNCE=y
+
+#
+# Classification
+#
+# CONFIG_QRTR is not set
 
 #
 # Device Drivers
@@ -452,10 +484,37 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_TEGRA_AHB=y
 
 #
-# Generic Driver Options
+# Cadence PCIe controllers support
+#
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCI_V3_SEMI=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_ALTERA_MSI=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_MEDIATEK is not set
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_DRA7XX_HOST=y
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_KEYSTONE=y
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_HISI_STB=y
+
+#
+# Firmware loader
 #
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_SOC_BUS=y
+CONFIG_REGMAP_SPMI=m
 
 #
 # Bus devices
@@ -465,16 +524,19 @@ 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_SUN50I_DE2_BUS is not set
 CONFIG_SUNXI_RSB=m
-CONFIG_OF_DYNAMIC=y
+CONFIG_TEGRA_GMI=m
+CONFIG_TI_SYSC=y
 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_QCOM_FASTRPC is not set
+CONFIG_SRAM_EXEC=y
 
 #
 # VOP Driver
@@ -485,14 +547,17 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # SCSI Transports
 #
 CONFIG_SCSI_UFS_QCOM=m
+# CONFIG_SCSI_UFS_HISI is not set
 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_MTK=m
 CONFIG_AHCI_SUNXI=m
 CONFIG_AHCI_TEGRA=m
 
@@ -511,8 +576,12 @@ CONFIG_PATA_IMX=m
 #
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
+CONFIG_ARC_EMAC_CORE=m
+CONFIG_EMAC_ROCKCHIP=m
+CONFIG_BGMAC=y
+CONFIG_BGMAC_BCMA=m
+CONFIG_BGMAC_PLATFORM=y
 # CONFIG_MACB is not set
-CONFIG_BGMAC=m
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_VENDOR_CIRRUS=y
 CONFIG_CS89x0=m
@@ -533,20 +602,34 @@ CONFIG_NET_MEDIATEK_SOC=m
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC911X=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_STI=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
-CONFIG_TI_CPSW_PHY_SEL=y
 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
 #
-CONFIG_MDIO_SUN4I=m
-CONFIG_MDIO_BCM_IPROC=m
+CONFIG_ATH10K_SNOC=m
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+CONFIG_VMXNET3=m
 
 #
 # Input device support
@@ -566,7 +649,6 @@ CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_TEGRA=m
 CONFIG_KEYBOARD_PMIC8XXX=m
-CONFIG_KEYBOARD_SAMSUNG=y
 # CONFIG_KEYBOARD_ST_KEYSCAN is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 # CONFIG_INPUT_AB8500_PONKEY is not set
@@ -574,12 +656,18 @@ 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
 #
 CONFIG_SERIO_SUN4I_PS2=m
 
+#
+# Character devices
+#
+# CONFIG_DEVKMEM is not set
+
 #
 # Serial drivers
 #
@@ -600,22 +688,18 @@ CONFIG_SERIAL_IMX=m
 CONFIG_SERIAL_OMAP=m
 CONFIG_SERIAL_BCM63XX=m
 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_MSM=m
+CONFIG_HW_RANDOM_IMX_RNGC=m
+CONFIG_HW_RANDOM_HISI=y
 CONFIG_HW_RANDOM_ST=m
-CONFIG_NVRAM=y
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_DEMUX_PINCTRL=m
+CONFIG_HW_RANDOM_MTK=y
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_KEYSTONE=m
 
 #
 # PC SMBus host controller drivers
@@ -629,8 +713,11 @@ CONFIG_I2C_BCM_IPROC=m
 # CONFIG_I2C_BRCMSTB is not set
 # CONFIG_I2C_CADENCE is not set
 CONFIG_I2C_DAVINCI=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=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
@@ -652,34 +739,18 @@ CONFIG_SPMI_MSM_PMIC_ARB=m
 # HSI controllers
 #
 CONFIG_OMAP_SSI=m
-CONFIG_OMAP_SSI_PORT=m
-
-#
-# PPS support
-#
-CONFIG_PPS=y
 
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_GIANFAR=m
+CONFIG_PTP_1588_CLOCK_QORIQ=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_MCP23S08 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SIRF=y
@@ -687,53 +758,57 @@ CONFIG_PINCTRL_ST=y
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINCTRL_IPROC_GPIO=y
+CONFIG_PINCTRL_NS=y
+CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_BERLIN=y
-# CONFIG_PINCTRL_BERLIN_BG2 is not set
-# CONFIG_PINCTRL_BERLIN_BG2CD is not set
-# CONFIG_PINCTRL_BERLIN_BG2Q is not set
+CONFIG_PINCTRL_AS370=y
 CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
+CONFIG_PINCTRL_IMX6SLL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_VF610=y
 CONFIG_PINCTRL_ABX500=y
 CONFIG_PINCTRL_AB8500=y
-CONFIG_PINCTRL_AB8540=y
-CONFIG_PINCTRL_AB9540=y
 CONFIG_PINCTRL_AB8505=y
 CONFIG_PINCTRL_NOMADIK=y
 CONFIG_PINCTRL_DB8500=y
-CONFIG_PINCTRL_DB8540=y
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_APQ8064=y
 CONFIG_PINCTRL_APQ8084=y
 CONFIG_PINCTRL_IPQ4019=y
 CONFIG_PINCTRL_IPQ8064=y
+CONFIG_PINCTRL_IPQ8074=m
 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_MSM8998=m
+CONFIG_PINCTRL_QCS404=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
+CONFIG_PINCTRL_SDM660=m
+CONFIG_PINCTRL_SDM845=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
-CONFIG_PINCTRL_EXYNOS5440=y
+CONFIG_PINCTRL_EXYNOS_ARM=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
 CONFIG_PINCTRL_SUN8I_A33=y
 CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=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_TEGRA=y
@@ -742,13 +817,23 @@ CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
 CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_TI_IODELAY=y
 # CONFIG_PINCTRL_WM8850 is not set
+
+#
+# MediaTek pinctrl drivers
+#
+CONFIG_EINT_MTK=y
 CONFIG_PINCTRL_MTK=y
+CONFIG_PINCTRL_MTK_MOORE=y
 # CONFIG_PINCTRL_MT2701 is not set
 CONFIG_PINCTRL_MT7623=y
+CONFIG_PINCTRL_MT7629=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
+CONFIG_PINCTRL_MESON8=y
+CONFIG_PINCTRL_MESON8B=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 
 #
@@ -757,39 +842,55 @@ 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
+CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_VF610=y
 # CONFIG_GPIO_XILINX is not set
 # 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_POWER_RESET_BRCMSTB=y
+# CONFIG_ROCKCHIP_IODOMAIN is not set
+CONFIG_POWER_RESET_BRCMKONA=y
 CONFIG_POWER_RESET_HISI=y
-CONFIG_POWER_RESET_IMX=y
 # CONFIG_POWER_RESET_MSM is not set
+CONFIG_POWER_RESET_QCOM_PON=m
 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_TEGRA_SOCTHERM=m
-CONFIG_DB8500_CPUFREQ_COOLING=y
 CONFIG_MTK_THERMAL=m
 
+#
+# Broadcom thermal drivers
+#
+CONFIG_BRCMSTB_THERMAL=m
+CONFIG_BCM_NS_THERMAL=y
+CONFIG_BCM_SR_THERMAL=y
+
 #
 # Texas Instruments thermal drivers
 #
@@ -807,9 +908,21 @@ CONFIG_ST_THERMAL=m
 CONFIG_ST_THERMAL_SYSCFG=m
 CONFIG_ST_THERMAL_MEMMAP=m
 
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=m
+
+#
+# Qualcomm thermal drivers
+#
+CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
+
 #
 # Watchdog Device Drivers
 #
+CONFIG_FTWDT010_WATCHDOG=m
 CONFIG_S3C2410_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
@@ -822,24 +935,26 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
 CONFIG_MEDIATEK_WATCHDOG=m
 CONFIG_ATLAS7_WATCHDOG=m
+CONFIG_PM8916_WATCHDOG=m
 CONFIG_BCM47XX_WDT=m
 CONFIG_BCM7038_WDT=m
 
 #
-# Sonics Silicon Backplane
+# Watchdog Pretimeout Governors
 #
 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_CROS_EC is not set
 # CONFIG_MFD_ASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
+CONFIG_MFD_EXYNOS_LPASS=m
+CONFIG_MFD_HI655X_PMIC=m
 CONFIG_MFD_PM8XXX=m
-CONFIG_MFD_PM8921_CORE=m
 CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_ABX500_CORE=y
@@ -861,6 +976,8 @@ CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_DBX500_PRCMU=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
 CONFIG_REGULATOR_GPIO=y
+# CONFIG_REGULATOR_HI6421V530 is not set
+CONFIG_REGULATOR_HI655X=m
 CONFIG_REGULATOR_LP872X=y
 CONFIG_REGULATOR_LP8788=y
 CONFIG_REGULATOR_PBIAS=m
@@ -868,29 +985,46 @@ CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TWL4030=y
+CONFIG_CEC_PIN=y
+CONFIG_IR_MTK=m
+CONFIG_IR_RX51=m
+# CONFIG_RC_ST is not set
+CONFIG_IR_SUNXI=m
 
 #
-# Media drivers
+# Multimedia core support
 #
-# CONFIG_RC_ST is not set
-CONFIG_IR_SUNXI=m
+# CONFIG_CEC_PIN_ERROR_INJ is not set
 
 #
 # Media digital TV PCI Adapters
 #
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
+# CONFIG_VIDEO_QCOM_CAMSS 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_SUN6I_CSI is not set
 # CONFIG_VIDEO_TI_CAL is not set
 # CONFIG_VIDEO_CODA is not set
+# CONFIG_VIDEO_IMX_PXP 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_ROCKCHIP_RGA is not set
 # CONFIG_VIDEO_TI_VPE is not set
+# CONFIG_VIDEO_QCOM_VENUS is not set
 CONFIG_DVB_C8SECTPFE=m
 
 #
@@ -906,7 +1040,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 
 #
-# ACP (Audio CoProcessor) Configuration
+# AMD Library routines
 #
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
@@ -930,19 +1064,30 @@ CONFIG_DRM_EXYNOS_MIC=y
 #
 # Sub-drivers
 #
-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_EXYNOS_SCALER is not set
 CONFIG_DRM_ROCKCHIP=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_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_RGB=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=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
@@ -950,6 +1095,7 @@ CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP2_DSS_HDMI_COMMON=y
 CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI_CEC=y
 CONFIG_OMAP5_DSS_HDMI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
@@ -959,36 +1105,46 @@ 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
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM_DSI=y
 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_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
+# CONFIG_DRM_STM is not set
 
 #
 # Display Interface Bridges
 #
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_ANALOGIX_DP=m
+CONFIG_DRM_DW_MIPI_DSI=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_V3D=m
+CONFIG_DRM_VC4=m
+CONFIG_DRM_VC4_HDMI_CEC=y
+CONFIG_DRM_MEDIATEK=m
+CONFIG_DRM_MEDIATEK_HDMI=m
+# CONFIG_DRM_TVE200 is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
 # Frame buffer hardware drivers
@@ -996,19 +1152,28 @@ CONFIG_DRM_ETNAVIV=m
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_VT8500 is not set
 # CONFIG_FB_WM8505 is not set
-# CONFIG_FB_S3C is not set
 # CONFIG_FB_XILINX is not set
 # 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
+CONFIG_SND_ALS300=m
+# CONFIG_SND_ALI5451 is not set
+CONFIG_SND_AZT3328=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+# CONFIG_SND_ES1968_INPUT is not set
+CONFIG_SND_ICE1712=m
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3_INPUT is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
 
 #
 # HD-Audio
@@ -1017,10 +1182,12 @@ 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:
 #
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_IMX_SOC=m
@@ -1030,16 +1197,25 @@ CONFIG_SND_SOC_IMX_SSI=m
 # SoC Audio support for Freescale i.MX boards:
 #
 CONFIG_SND_SOC_EUKREA_TLV320=m
-CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_ES8328=m
 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_MT6797=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
 CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
+CONFIG_SND_SOC_MT8183=m
+
+#
+# ASoC support for Amlogic platforms
+#
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
@@ -1049,9 +1225,11 @@ CONFIG_SND_SOC_STORM=m
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_PDM=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
@@ -1060,7 +1238,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
@@ -1071,31 +1249,37 @@ 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_SUN8I_ADDA_PR_REGMAP=m
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
+CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
 
 #
 # CODEC drivers
 #
 CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
-CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
+CONFIG_SND_SYNTH_EMUX=m
 
 #
 # USB Host Controller Drivers
 #
+CONFIG_USB_XHCI_HISTB=m
 CONFIG_USB_XHCI_MTK=m
+CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_STI=m
-CONFIG_USB_EHCI_MSM=y
 CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_OHCI_HCD_STI=m
@@ -1105,6 +1289,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
 #
@@ -1130,6 +1321,7 @@ CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3_ST=m
+CONFIG_USB_DWC3_QCOM=m
 
 #
 # USB Physical Layer drivers
@@ -1138,13 +1330,14 @@ CONFIG_USB_DWC3_ST=m
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
-CONFIG_USB_MSM_OTG=m
-CONFIG_USB_QCOM_8X16_PHY=m
+CONFIG_TWL6030_USB=m
 CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=y
 
 #
 # 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
@@ -1161,17 +1354,25 @@ 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
+CONFIG_RTC_DRV_BRCMSTB=y
 
 #
 # Platform RTC drivers
@@ -1183,22 +1384,24 @@ CONFIG_RTC_DRV_CMOS=y
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_MESON=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
 CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
 CONFIG_RTC_DRV_SIRFSOC=m
 CONFIG_RTC_DRV_ST_LPC=m
+CONFIG_RTC_DRV_MT7622=m
 
 #
 # DMA Devices
 #
 CONFIG_AXI_DMAC=m
-# CONFIG_DMA_OMAP is not set
 CONFIG_DMA_SUN4I=m
 CONFIG_DMA_SUN6I=m
 # CONFIG_IMX_DMA is not set
@@ -1210,50 +1413,123 @@ 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_MTK_HSDMA=m
+CONFIG_MTK_CQDMA=m
+# CONFIG_QCOM_BAM_DMA is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_TI_EDMA is not set
-CONFIG_XILINX_VDMA=m
-# CONFIG_QCOM_BAM_DMA is not set
+# CONFIG_DMA_OMAP is not set
 
 #
-# Microsoft Hyper-V guest support
+# Xen driver support
 #
-CONFIG_CHROME_PLATFORMS=y
+# CONFIG_MELLANOX_PLATFORM is not set
 
 #
 # 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_CLK_BCM_SR=y
+CONFIG_COMMON_CLK_HI3516CV300=y
+CONFIG_COMMON_CLK_HI3519=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_MXC_CLK=y
+CONFIG_COMMON_CLK_KEYSTONE=y
+CONFIG_TI_SCI_CLK=m
+
+#
+# Clock driver for MediaTek SoC
+#
+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_MT2701_AUDSYS is not set
+# CONFIG_COMMON_CLK_MT2701_G3DSYS is not set
+CONFIG_COMMON_CLK_MT7622=y
+CONFIG_COMMON_CLK_MT7622_ETHSYS=y
+CONFIG_COMMON_CLK_MT7622_HIFSYS=y
+CONFIG_COMMON_CLK_MT7622_AUDSYS=y
+CONFIG_COMMON_CLK_MT7629=y
+CONFIG_COMMON_CLK_MT7629_ETHSYS=y
+CONFIG_COMMON_CLK_MT7629_HIFSYS=y
+CONFIG_COMMON_CLK_MT8135=y
+CONFIG_COMMON_CLK_MT8173=y
+CONFIG_COMMON_CLK_MESON_INPUT=m
+CONFIG_COMMON_CLK_MESON8B=y
+CONFIG_KRAIT_CLOCKS=y
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_QCOM_A53PLL=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
 CONFIG_IPQ_GCC_806X=m
 CONFIG_IPQ_LCC_806X=m
+CONFIG_IPQ_GCC_8074=m
 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_MSM_GCC_8998=m
+CONFIG_QCS_GCC_404=m
+CONFIG_SDM_CAMCC_845=m
+CONFIG_SDM_GCC_660=m
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
+CONFIG_SDM_LPASSCC_845=m
+CONFIG_SPMI_PMIC_CLKDIV=m
+CONFIG_QCOM_HFPLL=m
+CONFIG_KPSS_XCC=m
+CONFIG_KRAITCC=m
 CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN4I_A10_CCU=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SUN8I_R40_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
+CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_COMMON_CLK_TI_ADPLL=m
-CONFIG_HWSPINLOCK=m
-
-#
-# Hardware Spinlock drivers
-#
 # CONFIG_HWSPINLOCK_OMAP is not set
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HWSPINLOCK_SIRF=m
@@ -1262,6 +1538,7 @@ CONFIG_HWSPINLOCK_SIRF=m
 #
 # Clock Source drivers
 #
+CONFIG_OMAP_DM_TIMER=y
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
@@ -1273,23 +1550,30 @@ CONFIG_VT8500_TIMER=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_NOMADIK_MTU=y
 CONFIG_CLKSRC_DBX500_PRCMU=y
-CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y
+CONFIG_ATLAS7_TIMER=y
+CONFIG_PRIMA2_TIMER=y
+CONFIG_KEYSTONE_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_GLOBAL_TIMER=y
 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_IMX_MBOX=m
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_ROCKCHIP_MBOX=y
 CONFIG_STI_MBOX=m
 CONFIG_TI_MESSAGE_MANAGER=m
+# CONFIG_HI3660_MBOX is not set
 CONFIG_HI6220_MBOX=m
+# CONFIG_QCOM_APCS_IPC is not set
+# CONFIG_TEGRA_HSP_MBOX is not set
+CONFIG_BCM_PDC_MBOX=m
+CONFIG_MTK_CMDQ_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
@@ -1302,73 +1586,143 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_EXYNOS_IOMMU is not set
 CONFIG_ARM_SMMU=y
 CONFIG_MTK_IOMMU=y
+CONFIG_MTK_IOMMU_V1=y
+CONFIG_QCOM_IOMMU=y
 
 #
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
+CONFIG_IMX_REMOTEPROC=m
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=m
+CONFIG_KEYSTONE_REMOTEPROC=m
+CONFIG_QCOM_RPROC_COMMON=m
+CONFIG_QCOM_Q6V5_COMMON=m
+CONFIG_QCOM_Q6V5_ADSP=m
+CONFIG_QCOM_Q6V5_MSS=m
+CONFIG_QCOM_Q6V5_PAS=m
+CONFIG_QCOM_Q6V5_WCSS=m
+# CONFIG_QCOM_SYSMON is not set
+CONFIG_QCOM_WCNSS_PIL=m
 CONFIG_ST_REMOTEPROC=m
+CONFIG_ST_SLIM_REMOTEPROC=m
 
 #
 # Rpmsg drivers
 #
-CONFIG_RPMSG=m
+# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_QCOM_SMD=m
 
 #
-# SOC (System On Chip) specific Drivers
+# Broadcom SoC drivers
 #
 CONFIG_SOC_BRCMSTB=y
-# CONFIG_MTK_INFRACFG is not set
+CONFIG_BRCMSTB_PM=y
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+CONFIG_FSL_GUTS=y
+
+#
+# i.MX SoC drivers
+#
+# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
+
+#
+# MediaTek SoC drivers
+#
+CONFIG_MTK_CMDQ=m
+CONFIG_MTK_INFRACFG=y
 # CONFIG_MTK_PMIC_WRAP is not set
 # CONFIG_MTK_SCPSYS is not set
+
+#
+# Qualcomm SoC drivers
+#
+# CONFIG_QCOM_COMMAND_DB is not set
+# CONFIG_QCOM_GENI_SE is not set
+# CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
+# CONFIG_QCOM_SDM845_LLCC is not set
+CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PM=y
+CONFIG_QCOM_QMI_HELPERS=m
+# CONFIG_QCOM_RMTFS_MEM is not set
 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_QCOM_APR 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_FUSE=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
 # CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set
 CONFIG_KEYSTONE_NAVIGATOR_DMA=m
+CONFIG_AMX3_PM=m
 CONFIG_WKUP_M3_IPC=m
+CONFIG_TI_SCI_PM_DOMAINS=m
+CONFIG_UX500_SOC_ID=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
 
 #
 # DEVFREQ Drivers
 #
-CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
+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
 #
+CONFIG_EXTCON_QCOM_SPMI_MISC=m
 # CONFIG_TI_AEMIF is not set
 # CONFIG_TI_EMIF is not set
 CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
-CONFIG_TEGRA20_MC=y
+CONFIG_TI_EMIF_SRAM=m
 CONFIG_MTK_SMI=y
+CONFIG_PL353_SMC=y
+CONFIG_SAMSUNG_MC=y
+CONFIG_EXYNOS_SROM=y
 CONFIG_TEGRA_MC=y
+CONFIG_TEGRA20_EMC=y
 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
 
 #
@@ -1376,10 +1730,14 @@ 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_IMX is not set
+CONFIG_PWM_HIBVT=m
+CONFIG_PWM_IMX1=m
+CONFIG_PWM_IMX27=m
 # 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
@@ -1389,6 +1747,10 @@ CONFIG_PWM_SUN4I=m
 # CONFIG_PWM_TIECAP is not set
 # CONFIG_PWM_TIEHRPWM is not set
 # CONFIG_PWM_VT8500 is not set
+
+#
+# IRQ chip support
+#
 CONFIG_GIC_NON_BANKED=y
 CONFIG_BCM7120_L2_IRQ=y
 CONFIG_BRCMSTB_L2_IRQ=y
@@ -1397,100 +1759,108 @@ CONFIG_OMAP_IRQCHIP=y
 CONFIG_ST_IRQCHIP=y
 CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
+# CONFIG_QCOM_PDC is not set
+CONFIG_IMX_IRQSTEER=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_BERLIN=y
+CONFIG_RESET_BRCMSTB=y
+CONFIG_RESET_QCOM_AOSS=y
+CONFIG_RESET_QCOM_PDC=m
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
+CONFIG_RESET_TI_SCI=m
+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_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
-CONFIG_PHY_EXYNOS5250_SATA=m
-CONFIG_PHY_HIX5HD2_SATA=m
-CONFIG_PHY_MT65XX_USB3=m
 CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_BCM_NS_USB2=m
+CONFIG_PHY_BCM_NS_USB3=m
+CONFIG_PHY_NS2_PCIE=y
+CONFIG_PHY_NS2_USB_DRD=y
+CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_BRCM_USB=m
+CONFIG_PHY_BCM_SR_PCIE=m
+CONFIG_PHY_HIX5HD2_SATA=m
+CONFIG_PHY_BERLIN_SATA=m
+CONFIG_PHY_BERLIN_USB=m
+CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_XSPHY=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_QCOM_QMP=m
+CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_14NM=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=y
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
+CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
 CONFIG_PHY_EXYNOS5250_USB2=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
-CONFIG_PHY_QCOM_APQ8064_SATA=m
-CONFIG_PHY_QCOM_IPQ806X_SATA=m
-CONFIG_PHY_ROCKCHIP_USB=m
-CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_EXYNOS5250_SATA=m
+CONFIG_PHY_MIPHY28LP=m
 CONFIG_PHY_STIH407_USB=m
-CONFIG_PHY_STIH41X_USB=m
-CONFIG_PHY_QCOM_UFS=m
-CONFIG_PHY_BRCMSTB_SATA=m
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_DM816X_USB=m
+CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_OMAP_USB2=m
+CONFIG_TI_PIPE3=m
+CONFIG_TWL4030_USB=m
+CONFIG_PHY_TI_GMII_SEL=m
 
 #
 # 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
+CONFIG_NVMEM_SNVS_LPGPR=m
 
 #
-# Firmware Drivers
-#
-CONFIG_QCOM_SCM=y
-CONFIG_QCOM_SCM_32=y
-CONFIG_BCM47XX_NVRAM=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_VMCORE=y
-
-#
-# Memory Debugging
+# HW tracing support
 #
-# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_TEE is not set
 
 #
-# RCU Debugging
+# Multiplexer drivers
 #
-# CONFIG_UPROBE_EVENT is not set
+# CONFIG_MUX_ADG792A is not set
+# CONFIG_MUX_GPIO is not set
+# CONFIG_MUX_MMIO is not set
 
 #
-# Runtime Testing
-#
-# CONFIG_ARM_PTDUMP is not set
-CONFIG_ARM_UNWIND=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEBUG_VF_UART_PORT=1
-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
+# Pseudo filesystems
 #
-CONFIG_CRYPTO_ENGINE=m
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 
 #
 # Random Number Generation
 #
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
 CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
@@ -1498,38 +1868,49 @@ 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_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_OMAP=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_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_MEDIATEK=m
+CONFIG_CRYPTO_DEV_BCM_SPU=m
 
 #
-# Certificates for signature checking
+# Library routines
 #
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-CONFIG_CRYPTO_SHA1_ARM_CE=m
-CONFIG_CRYPTO_SHA2_ARM_CE=m
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_CRYPTO_AES_ARM_BS=m
-CONFIG_CRYPTO_AES_ARM_CE=m
-CONFIG_CRYPTO_GHASH_ARM_CE=m
+CONFIG_STMP_DEVICE=y
 
 #
-# Library routines
+# Memory Debugging
 #
-CONFIG_STMP_DEVICE=y
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+
+#
+# RCU Debugging
+#
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_ARM_PTDUMP_CORE=y
+# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+CONFIG_DEBUG_WX=y
+CONFIG_UNWINDER_ARM=y
+CONFIG_ARM_UNWIND=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_VF_UART_PORT=1
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"