kernel: udpate to 5.2

[ipfire-3.x.git] / kernel / config-arm32-generic

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 54f4a2e69c139f74080fad3a639e2e91f6952bd6..f891ef6b7bcc8781a67aaec21476ea8cc2499b71 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -14,12 +14,12 @@ CONFIG_KERNEL_XZ=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
 
 #
-# RCU Subsystem
+# end of RCU Subsystem
 #
 CONFIG_PERF_USE_VMALLOC=y
 
 #
-# Kernel Performance Events And Counters
+# end of General setup
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -62,6 +62,10 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
+
+#
+# end of Multiple platform selection
+#
 CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_AT91 is not set
@@ -110,12 +114,11 @@ 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
+# end of Samsung Common options
 #
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HISI=y
@@ -127,6 +130,10 @@ CONFIG_ARCH_HI3xxx=y
 # CONFIG_ARCH_HIP01 is not set
 CONFIG_ARCH_HIP04=y
 CONFIG_ARCH_HIX5HD2=y
+
+#
+# end of Hisilicon platform type
+#
 CONFIG_ARCH_MXC=y
 
 #
@@ -174,6 +181,10 @@ CONFIG_ARCH_OMAP=y
 # CONFIG_OMAP_RESET_CLOCKS is not set
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
+
+#
+# end of TI OMAP Common Features
+#
 CONFIG_MACH_OMAP_GENERIC=y
 
 #
@@ -204,7 +215,15 @@ CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3_PANDORA=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+
+#
+# end of TI OMAP2/3/4 Specific Features
+#
 CONFIG_OMAP5_ERRATA_801819=y
+
+#
+# end of TI OMAP/AM/DM/DRA Family
+#
 CONFIG_ARCH_SIRF=y
 
 #
@@ -251,13 +270,6 @@ CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_PLAT_VERSATILE=y
-CONFIG_ARCH_SUPPORTS_FIRMWARE=y
-CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
-
-#
-# Firmware options
-#
-CONFIG_TRUSTED_FOUNDATIONS=y
 
 #
 # Processor Type
@@ -287,7 +299,6 @@ 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
@@ -319,6 +330,10 @@ CONFIG_ARM_ERRATA_821420=y
 CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
+
+#
+# end of System Type
+#
 CONFIG_KRAIT_L2_ACCESSORS=y
 
 #
@@ -397,6 +412,10 @@ CONFIG_ARM_HIGHBANK_CPUIDLE=y
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_ARM_U8500_CPUIDLE=y
 CONFIG_ARM_EXYNOS_CPUIDLE=y
+
+#
+# end of ARM CPU Idle Drivers
+#
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -419,6 +438,7 @@ CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_32=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_TI_SCI_PROTOCOL=m
+CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_BCM47XX_NVRAM=y
 # CONFIG_BCM47XX_SPROM is not set
 # CONFIG_IMX_SCU is not set
@@ -427,6 +447,10 @@ CONFIG_BCM47XX_NVRAM=y
 # Tegra firmware driver
 #
 # CONFIG_TEGRA_IVC is not set
+
+#
+# end of Firmware Drivers
+#
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
@@ -455,10 +479,9 @@ CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 
 #
-# GCOV-based kernel profiling
+# GCC plugins
 #
 CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
-CONFIG_LBDAF=y
 
 #
 # Executable file formats
@@ -484,7 +507,7 @@ CONFIG_BOUNCE=y
 CONFIG_TEGRA_AHB=y
 
 #
-# Cadence PCIe controllers support
+# end of Cadence PCIe controllers support
 #
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
@@ -506,6 +529,7 @@ CONFIG_PCI_DRA7XX=y
 CONFIG_PCI_DRA7XX_HOST=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_KEYSTONE=y
+CONFIG_PCI_KEYSTONE_HOST=y
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_HISI_STB=y
@@ -514,6 +538,10 @@ CONFIG_PCIE_HISI_STB=y
 # Firmware loader
 #
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+
+#
+# end of Firmware loader
+#
 CONFIG_REGMAP_SPMI=m
 
 #
@@ -529,6 +557,10 @@ CONFIG_QCOM_EBI2=y
 CONFIG_SUNXI_RSB=m
 CONFIG_TEGRA_GMI=m
 CONFIG_TI_SYSC=y
+
+#
+# end of Bus devices
+#
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 
 #
@@ -539,14 +571,15 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_SRAM_EXEC=y
 
 #
-# VOP Driver
+# end of Misc devices
 #
 # CONFIG_IDE is not set
 
 #
-# SCSI Transports
+# end of SCSI Transports
 #
 CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SCSI_UFS_MEDIATEK=m
 # CONFIG_SCSI_UFS_HISI is not set
 CONFIG_SCSI_NSP32=m
 
@@ -572,7 +605,7 @@ CONFIG_SATA_HIGHBANK=m
 CONFIG_PATA_IMX=m
 
 #
-# Distributed Switch Architecture drivers
+# end of Distributed Switch Architecture drivers
 #
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
@@ -611,7 +644,6 @@ 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=m
 # CONFIG_TI_CPTS is not set
 CONFIG_NET_VENDOR_XILINX=y
@@ -624,6 +656,7 @@ CONFIG_MDIO_SUN4I=m
 #
 # MII PHY device drivers
 #
+CONFIG_BCM_CYGNUS_PHY=m
 CONFIG_ATH10K_SNOC=m
 
 #
@@ -688,6 +721,10 @@ CONFIG_SERIAL_IMX=m
 CONFIG_SERIAL_OMAP=m
 CONFIG_SERIAL_BCM63XX=m
 CONFIG_SERIAL_ST_ASC=m
+
+#
+# end of Serial drivers
+#
 CONFIG_SERIAL_MCTRL_GPIO=m
 # CONFIG_HVC_DCC is not set
 CONFIG_HW_RANDOM_BCM2835=y
@@ -731,7 +768,7 @@ CONFIG_I2C_TEGRA=m
 CONFIG_I2C_WMT=m
 
 #
-# Other I2C/SMBus bus drivers
+# end of I2C support
 #
 CONFIG_SPMI_MSM_PMIC_ARB=m
 
@@ -746,7 +783,7 @@ CONFIG_OMAP_SSI=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# end of PTP clock support
 #
 # CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
@@ -811,6 +848,11 @@ 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=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+CONFIG_PINCTRL_SUN50I_H6=y
+CONFIG_PINCTRL_SUN50I_H6_R=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
@@ -832,6 +874,10 @@ CONFIG_PINCTRL_MT7629=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
+
+#
+# end of MediaTek pinctrl drivers
+#
 CONFIG_PINCTRL_MESON8=y
 CONFIG_PINCTRL_MESON8B=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -862,7 +908,7 @@ CONFIG_GPIO_TS4900=m
 # CONFIG_HTC_EGPIO is not set
 
 #
-# USB GPIO expanders
+# end of USB GPIO expanders
 #
 # CONFIG_ROCKCHIP_IODOMAIN is not set
 CONFIG_POWER_RESET_BRCMKONA=y
@@ -940,7 +986,7 @@ CONFIG_BCM47XX_WDT=m
 CONFIG_BCM7038_WDT=m
 
 #
-# Watchdog Pretimeout Governors
+# USB-based Watchdog Cards
 #
 CONFIG_SSB_HOST_SOC=y
 
@@ -963,7 +1009,7 @@ CONFIG_AB8500_CORE=y
 CONFIG_MFD_DB8500_PRCMU=y
 
 #
-# STMicroelectronics STMPE Interface Drivers
+# end of STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_OMAP_USB_HOST=y
@@ -971,6 +1017,10 @@ CONFIG_TWL4030_POWER=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
+
+#
+# end of Multifunction device drivers
+#
 CONFIG_REGULATOR_88PM8607=y
 # CONFIG_REGULATOR_AB8500 is not set
 CONFIG_REGULATOR_DBX500_PRCMU=y
@@ -1040,7 +1090,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 
 #
-# AMD Library routines
+# end of Display Engine Configuration
 #
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
@@ -1075,6 +1125,7 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_SUN4I=m
@@ -1106,16 +1157,18 @@ CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 # OMAPDRM External Display Device Drivers
 #
 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
+
+#
+# end of OMAPDRM External Display Device Drivers
+#
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_GPU_SUDO is not set
 CONFIG_DRM_MSM_HDMI_HDCP=y
@@ -1136,6 +1189,10 @@ CONFIG_DRM_TEGRA=m
 #
 CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_DW_MIPI_DSI=m
+
+#
+# end of Display Interface Bridges
+#
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_V3D=m
@@ -1158,7 +1215,7 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 # CONFIG_FB_MXS is not set
 
 #
-# Console display driver support
+# end of Graphics support
 #
 CONFIG_SND_ALS300=m
 # CONFIG_SND_ALI5451 is not set
@@ -1179,6 +1236,10 @@ CONFIG_SND_TRIDENT=m
 # HD-Audio
 #
 CONFIG_SND_HDA_TEGRA=m
+
+#
+# end of HD-Audio
+#
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 # CONFIG_SND_SOC_ADI is not set
@@ -1201,6 +1262,11 @@ 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_IMX_AUDMIX=m
+
+#
+# end of SoC Audio for Freescale CPUs
+#
 CONFIG_SND_SOC_MEDIATEK=m
 CONFIG_SND_SOC_MT2701=m
 CONFIG_SND_SOC_MT2701_CS42448=m
@@ -1212,9 +1278,11 @@ 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
+CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
+CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
 
 #
-# ASoC support for Amlogic platforms
+# end of ASoC support for Amlogic platforms
 #
 CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_LPASS_CPU=m
@@ -1255,6 +1323,10 @@ CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
+
+#
+# end of Allwinner SoC Audio support
+#
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_XILINX_I2S=m
@@ -1269,6 +1341,10 @@ CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
+
+#
+# end of CODEC drivers
+#
 CONFIG_SND_SYNTH_EMUX=m
 
 #
@@ -1337,7 +1413,6 @@ 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
@@ -1423,7 +1498,7 @@ CONFIG_MTK_CQDMA=m
 # CONFIG_DMA_OMAP is not set
 
 #
-# Xen driver support
+# end of Xen driver support
 #
 # CONFIG_MELLANOX_PLATFORM is not set
 
@@ -1473,6 +1548,11 @@ 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_MT8516=y
+
+#
+# end of Clock driver for MediaTek SoC
+#
 CONFIG_COMMON_CLK_MESON_INPUT=m
 CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_KRAIT_CLOCKS=y
@@ -1503,6 +1583,7 @@ CONFIG_MSM_GCC_8998=m
 CONFIG_QCS_GCC_404=m
 CONFIG_SDM_CAMCC_845=m
 CONFIG_SDM_GCC_660=m
+CONFIG_QCS_TURING_404=m
 CONFIG_SDM_GCC_845=m
 CONFIG_SDM_GPUCC_845=m
 CONFIG_SDM_VIDEOCC_845=m
@@ -1514,6 +1595,11 @@ CONFIG_KPSS_XCC=m
 CONFIG_KRAITCC=m
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN5I_CCU=y
@@ -1530,6 +1616,10 @@ CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_COMMON_CLK_TI_ADPLL=m
+
+#
+# end of Common Clock Framework
+#
 # CONFIG_HWSPINLOCK_OMAP is not set
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HWSPINLOCK_SIRF=m
@@ -1555,12 +1645,17 @@ CONFIG_PRIMA2_TIMER=y
 CONFIG_KEYSTONE_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_TIMER_SP804=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_IMX_GPT=y
 CONFIG_CLKSRC_ST_LPC=y
+
+#
+# end of Clock Source drivers
+#
 CONFIG_IMX_MBOX=m
 CONFIG_PL320_MBOX=y
 CONFIG_OMAP2PLUS_MBOX=m
@@ -1576,7 +1671,7 @@ CONFIG_BCM_PDC_MBOX=m
 CONFIG_MTK_CMDQ_MBOX=m
 
 #
-# Generic IOMMU Pagetable Support
+# end of Generic IOMMU Pagetable Support
 #
 CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
@@ -1585,6 +1680,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_TEGRA_IOMMU_SMMU is not set
 # CONFIG_EXYNOS_IOMMU is not set
 CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_MTK_IOMMU=y
 CONFIG_MTK_IOMMU_V1=y
 CONFIG_QCOM_IOMMU=y
@@ -1657,6 +1753,10 @@ CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMSM is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_APR is not set
+
+#
+# end of Qualcomm SoC drivers
+#
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
@@ -1726,7 +1826,7 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_XILINX_XADC is not set
 
 #
-# Temperature sensors
+# end of Temperature sensors
 #
 # CONFIG_PWM_AB8500 is not set
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
@@ -1736,6 +1836,7 @@ CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IMX1=m
 CONFIG_PWM_IMX27=m
+CONFIG_PWM_IMX_TPM=m
 # CONFIG_PWM_MTK_DISP is not set
 CONFIG_PWM_MEDIATEK=m
 CONFIG_PWM_OMAP_DMTIMER=m
@@ -1761,6 +1862,10 @@ CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
 # CONFIG_QCOM_PDC is not set
 CONFIG_IMX_IRQSTEER=y
+
+#
+# end of IRQ chip support
+#
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
 CONFIG_RESET_BRCMSTB=y
@@ -1781,6 +1886,7 @@ CONFIG_COMMON_RESET_HI6220=m
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_BCM_SR_USB=y
 CONFIG_PHY_BCM_NS_USB2=m
 CONFIG_PHY_BCM_NS_USB3=m
 CONFIG_PHY_NS2_PCIE=y
@@ -1792,6 +1898,7 @@ CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_UFS=m
 CONFIG_PHY_MTK_XSPHY=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
@@ -1825,7 +1932,7 @@ CONFIG_TWL4030_USB=m
 CONFIG_PHY_TI_GMII_SEL=m
 
 #
-# Android
+# end of Android
 #
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
@@ -1838,7 +1945,7 @@ CONFIG_NVMEM_VF610_OCOTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 
 #
-# HW tracing support
+# end of HW tracing support
 #
 # CONFIG_TEE is not set
 
@@ -1877,7 +1984,6 @@ 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
@@ -1901,7 +2007,7 @@ CONFIG_STMP_DEVICE=y
 # CONFIG_DEBUG_HIGHMEM is not set
 
 #
-# RCU Debugging
+# end of RCU Debugging
 #
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_ARM_PTDUMP_CORE=y