Merge tag 'imx-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...

i.MX defconfig changes for 5.7:

 - A seris from Li Yang to make defconfig useful for NXP LS family SoCs.
   Most drivers are built as module there, but those helping boot system
   with NFS are enabled built-in.
 - Enable i.MX8MP pinctrl and i.MX8MM thermal driver support in
   defconfig.
 - Enable i.MX DRM driver support for multi_v7_defconfig.
 - Enable ATMEL_MXT and AD7879 touch support for imx_v6_v7_defconfig.

* tag 'imx-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits)
  arm64: defconfig: Enable e1000 device
  arm64: defconfig: Enable PHY devices used on QorIQ boards
  arm64: defconfig: Enable RTC devices for QorIQ boards
  arm64: defconfig: Enable flash device drivers for QorIQ boards
  arm64: defconfig: Enable ARM Mali display driver
  arm64: defconfig: Enable QorIQ GPIO driver
  arm64: defconfig: Enable QorIQ IFC NAND controller driver
  arm64: defconfig: Enable ARM SBSA watchdog driver
  arm64: defconfig: Enable QorIQ cpufreq driver
  arm64: defconfig: Enable NXP/FSL SPI controller drivers
  arm64: defconfig: Enable ENETC Ethernet controller and FELIX switch
  arm64: defconfig: Enable QorIQ DPAA2 drivers
  arm64: defconfig: Enable QorIQ DPAA1 drivers
  arm64: defconfig: Enable NXP flexcan driver
  arm64: defconfig: run through savedefconfig for ordering
  arm64: defconfig: Enable CONFIG_IMX8MM_THERMAL as module
  arm64: defconfig: add i.MX system controller thermal support
  ARM: multi_v7_defconfig: enable drm imx support
  arm64: defconfig: Enable CONFIG_PCIE_LAYERSCAPE_GEN4
  ARM: imx_v6_v7_defconfig: Enable TOUCHSCREEN_AD7879
  ...

Link: https://lore.kernel.org/r/20200318051918.32579-6-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/configs/multi_v7_defconfig
index 7c8a1c3,c5ff912..e573c1b
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -113,7 -113,6 +113,7 @@@ CONFIG_CPU_IDLE=
  CONFIG_ARM_CPUIDLE=y
  CONFIG_ARM_ZYNQ_CPUIDLE=y
  CONFIG_ARM_EXYNOS_CPUIDLE=y
 +CONFIG_ARM_TEGRA_CPUIDLE=y
  CONFIG_KERNEL_MODE_NEON=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_TRUSTED_FOUNDATIONS=y
@@@ -641,6 -640,7 +641,7 @@@ CONFIG_CEC_PLATFORM_DRIVERS=
  CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
+ CONFIG_IMX_IPUV3_CORE=m
  CONFIG_DRM=y
  # CONFIG_DRM_I2C_CH7006 is not set
  # CONFIG_DRM_I2C_SIL164 is not set
@@@ -656,6 -656,11 +657,11 @@@ CONFIG_ROCKCHIP_ANALOGIX_DP=
  CONFIG_ROCKCHIP_DW_HDMI=y
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
+ CONFIG_DRM_IMX=m
+ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
+ CONFIG_DRM_IMX_TVE=m
+ CONFIG_DRM_IMX_LDB=m
+ CONFIG_DRM_IMX_HDMI=m
  CONFIG_DRM_ATMEL_HLCDC=m
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_LVDS=y

diff --combined arch/arm64/configs/defconfig
index 1d44f8f,0c11018..be19c4e
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -90,6 -90,7 +90,7 @@@ CONFIG_ARM_QCOM_CPUFREQ_NVMEM=
  CONFIG_ARM_QCOM_CPUFREQ_HW=y
  CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
  CONFIG_ARM_TEGRA186_CPUFREQ=y
+ CONFIG_QORIQ_CPUFREQ=y
  CONFIG_ARM_SCPI_PROTOCOL=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_INTEL_STRATIX10_SERVICE=y
@@@ -154,6 -155,7 +155,7 @@@ CONFIG_IP6_NF_NAT=
  CONFIG_IP6_NF_TARGET_MASQUERADE=m
  CONFIG_BRIDGE=m
  CONFIG_BRIDGE_VLAN_FILTERING=y
+ CONFIG_NET_DSA=m
  CONFIG_VLAN_8021Q=m
  CONFIG_VLAN_8021Q_GVRP=y
  CONFIG_VLAN_8021Q_MVRP=y
@@@ -162,8 -164,7 +164,9 @@@ CONFIG_QRTR_SMD=
  CONFIG_QRTR_TUN=m
  CONFIG_BPF_JIT=y
  CONFIG_CAN=m
 +CONFIG_CAN_RCAR=m
 +CONFIG_CAN_RCAR_CANFD=m
+ CONFIG_CAN_FLEXCAN=m
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
  # CONFIG_BT_HS is not set
@@@ -198,6 -199,7 +201,7 @@@ CONFIG_PCI_HOST_THUNDER_ECAM=
  CONFIG_PCIE_ROCKCHIP_HOST=m
  CONFIG_PCIE_BRCMSTB=m
  CONFIG_PCI_LAYERSCAPE=y
+ CONFIG_PCIE_LAYERSCAPE_GEN4=y
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y
  CONFIG_PCIE_ARMADA_8K=y
@@@ -210,11 -212,22 +214,22 @@@ CONFIG_FW_LOADER_USER_HELPER=
  CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
  CONFIG_HISILICON_LPC=y
  CONFIG_SIMPLE_PM_BUS=y
+ CONFIG_FSL_MC_BUS=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
+ CONFIG_MTD_CFI=y
+ CONFIG_MTD_CFI_ADV_OPTIONS=y
+ CONFIG_MTD_CFI_INTELEXT=y
+ CONFIG_MTD_CFI_AMDSTD=y
+ CONFIG_MTD_CFI_STAA=y
+ CONFIG_MTD_PHYSMAP=y
+ CONFIG_MTD_PHYSMAP_OF=y
+ CONFIG_MTD_DATAFLASH=y
+ CONFIG_MTD_SST25L=y
  CONFIG_MTD_RAW_NAND=y
  CONFIG_MTD_NAND_DENALI_DT=y
  CONFIG_MTD_NAND_MARVELL=y
+ CONFIG_MTD_NAND_FSL_IFC=y
  CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_SPI_CADENCE_QUADSPI=y
@@@ -223,13 -236,13 +238,14 @@@ CONFIG_BLK_DEV_NBD=
  CONFIG_VIRTIO_BLK=y
  CONFIG_BLK_DEV_NVME=m
  CONFIG_SRAM=y
+ CONFIG_EEPROM_AT24=m
  CONFIG_EEPROM_AT25=m
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
  CONFIG_SCSI_SAS_ATA=y
  CONFIG_SCSI_HISI_SAS=y
  CONFIG_SCSI_HISI_SAS_PCI=y
 +CONFIG_MEGARAID_SAS=y
  CONFIG_SCSI_MPT3SAS=m
  CONFIG_SCSI_UFSHCD=y
  CONFIG_SCSI_UFSHCD_PLATFORM=y
@@@ -257,6 -270,7 +273,7 @@@ CONFIG_MACVTAP=
  CONFIG_TUN=y
  CONFIG_VETH=m
  CONFIG_VIRTIO_NET=y
+ CONFIG_NET_DSA_MSCC_FELIX=m
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
  CONFIG_ATL1C=m
@@@ -265,12 -279,18 +282,18 @@@ CONFIG_BNX2X=
  CONFIG_MACB=y
  CONFIG_THUNDER_NIC_PF=y
  CONFIG_FEC=y
+ CONFIG_FSL_FMAN=y
+ CONFIG_FSL_DPAA_ETH=y
+ CONFIG_FSL_DPAA2_ETH=y
+ CONFIG_FSL_ENETC=y
+ CONFIG_FSL_ENETC_VF=y
  CONFIG_HIX5HD2_GMAC=y
  CONFIG_HNS_DSAF=y
  CONFIG_HNS_ENET=y
  CONFIG_HNS3=y
  CONFIG_HNS3_HCLGE=y
  CONFIG_HNS3_ENET=y
+ CONFIG_E1000=y
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
@@@ -288,13 -308,17 +311,17 @@@ CONFIG_SNI_AVE=
  CONFIG_SNI_NETSEC=y
  CONFIG_STMMAC_ETH=m
  CONFIG_MDIO_BUS_MUX_MMIOREG=y
+ CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
+ CONFIG_AQUANTIA_PHY=y
  CONFIG_MARVELL_PHY=m
  CONFIG_MARVELL_10G_PHY=m
  CONFIG_MESON_GXL_PHY=m
  CONFIG_MICREL_PHY=y
+ CONFIG_MICROSEMI_PHY=y
  CONFIG_AT803X_PHY=y
  CONFIG_REALTEK_PHY=m
  CONFIG_ROCKCHIP_PHY=y
+ CONFIG_VITESSE_PHY=y
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
  CONFIG_USB_RTL8152=m
@@@ -324,7 -348,6 +351,7 @@@ CONFIG_INPUT_TOUCHSCREEN=
  CONFIG_TOUCHSCREEN_ATMEL_MXT=m
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_PM8941_PWRKEY=y
 +CONFIG_INPUT_PM8XXX_VIBRATOR=m
  CONFIG_INPUT_HISI_POWERKEY=y
  # CONFIG_SERIO_SERPORT is not set
  CONFIG_SERIO_AMBAKMI=y
@@@ -393,8 -416,11 +420,11 @@@ CONFIG_SPI=
  CONFIG_SPI_ARMADA_3700=y
  CONFIG_SPI_BCM2835=m
  CONFIG_SPI_BCM2835AUX=m
+ CONFIG_SPI_FSL_LPSPI=y
+ CONFIG_SPI_FSL_QUADSPI=y
  CONFIG_SPI_NXP_FLEXSPI=y
  CONFIG_SPI_IMX=m
+ CONFIG_SPI_FSL_DSPI=y
  CONFIG_SPI_MESON_SPICC=m
  CONFIG_SPI_MESON_SPIFC=m
  CONFIG_SPI_ORION=y
@@@ -404,7 -430,6 +434,7 @@@ CONFIG_SPI_QCOM_QSPI=
  CONFIG_SPI_QUP=y
  CONFIG_SPI_QCOM_GENI=m
  CONFIG_SPI_S3C64XX=y
 +CONFIG_SPI_SH_MSIOF=m
  CONFIG_SPI_SUN6I=y
  CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
@@@ -415,10 -440,10 +445,11 @@@ CONFIG_PINCTRL_S700=
  CONFIG_PINCTRL_S900=y
  CONFIG_PINCTRL_IMX8MM=y
  CONFIG_PINCTRL_IMX8MN=y
+ CONFIG_PINCTRL_IMX8MP=y
  CONFIG_PINCTRL_IMX8MQ=y
  CONFIG_PINCTRL_IMX8QXP=y
  CONFIG_PINCTRL_IPQ8074=y
 +CONFIG_PINCTRL_IPQ6018=y
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_MSM8994=y
  CONFIG_PINCTRL_MSM8996=y
@@@ -431,16 -456,15 +462,17 @@@ CONFIG_PINCTRL_SM8150=
  CONFIG_GPIO_ALTERA=m
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
+ CONFIG_GPIO_MPC8XXX=y
  CONFIG_GPIO_PL061=y
  CONFIG_GPIO_RCAR=y
  CONFIG_GPIO_UNIPHIER=y
 +CONFIG_GPIO_WCD934X=m
  CONFIG_GPIO_XGENE=y
  CONFIG_GPIO_XGENE_SB=y
  CONFIG_GPIO_MAX732X=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
 +CONFIG_GPIO_BD9571MWV=m
  CONFIG_GPIO_MAX77620=y
  CONFIG_POWER_AVS=y
  CONFIG_QCOM_CPR=y
@@@ -461,7 -485,8 +493,9 @@@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=
  CONFIG_CPU_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
  CONFIG_QORIQ_THERMAL=m
 +CONFIG_SUN8I_THERMAL=y
+ CONFIG_IMX_SC_THERMAL=m
+ CONFIG_IMX8MM_THERMAL=m
  CONFIG_ROCKCHIP_THERMAL=m
  CONFIG_RCAR_THERMAL=y
  CONFIG_RCAR_GEN3_THERMAL=y
@@@ -476,14 -501,15 +510,15 @@@ CONFIG_QCOM_SPMI_TEMP_ALARM=
  CONFIG_UNIPHIER_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
+ CONFIG_ARM_SBSA_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
  CONFIG_DW_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=m
  CONFIG_IMX2_WDT=y
  CONFIG_IMX_SC_WDT=m
+ CONFIG_QCOM_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
- CONFIG_QCOM_WDT=m
  CONFIG_RENESAS_WDT=y
  CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
@@@ -499,7 -525,6 +534,7 @@@ CONFIG_MFD_SPMI_PMIC=
  CONFIG_MFD_RK808=y
  CONFIG_MFD_SEC_CORE=y
  CONFIG_MFD_ROHM_BD718XX=y
 +CONFIG_MFD_WCD934X=m
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_AXP20X=y
  CONFIG_REGULATOR_BD718XX=y
@@@ -527,27 -552,22 +562,28 @@@ CONFIG_MEDIA_SUPPORT=
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
  CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 +CONFIG_MEDIA_SDR_SUPPORT=y
  CONFIG_MEDIA_CONTROLLER=y
  CONFIG_VIDEO_V4L2_SUBDEV_API=y
  # CONFIG_DVB_NET is not set
  CONFIG_MEDIA_USB_SUPPORT=y
  CONFIG_USB_VIDEO_CLASS=m
  CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_VIDEO_RCAR_CSI2=m
 +CONFIG_VIDEO_RCAR_VIN=m
  CONFIG_VIDEO_SUN6I_CSI=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
  CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 +CONFIG_VIDEO_RENESAS_FDP1=m
  CONFIG_VIDEO_RENESAS_FCP=m
  CONFIG_VIDEO_RENESAS_VSP1=m
 +CONFIG_SDR_PLATFORM_DRIVERS=y
 +CONFIG_VIDEO_RCAR_DRIF=m
  CONFIG_DRM=m
  CONFIG_DRM_I2C_NXP_TDA998X=m
+ CONFIG_DRM_MALI_DISPLAY=m
  CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_EXYNOS=m
  CONFIG_DRM_EXYNOS5433_DECON=y
@@@ -563,23 -583,15 +599,23 @@@ CONFIG_ROCKCHIP_DW_HDMI=
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_RCAR_DU=m
 +CONFIG_DRM_RCAR_DW_HDMI=m
  CONFIG_DRM_SUN4I=m
 +CONFIG_DRM_SUN6I_DSI=m
  CONFIG_DRM_SUN8I_DW_HDMI=m
  CONFIG_DRM_SUN8I_MIXER=m
  CONFIG_DRM_MSM=m
  CONFIG_DRM_TEGRA=m
 +CONFIG_DRM_PANEL_LVDS=m
  CONFIG_DRM_PANEL_SIMPLE=m
 +CONFIG_DRM_DUMB_VGA_DAC=m
 +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
  CONFIG_DRM_SII902X=m
 +CONFIG_DRM_THINE_THC63LVD1024=m
  CONFIG_DRM_TI_SN65DSI86=m
  CONFIG_DRM_I2C_ADV7511=m
 +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 +CONFIG_DRM_DW_HDMI_CEC=m
  CONFIG_DRM_VC4=m
  CONFIG_DRM_ETNAVIV=m
  CONFIG_DRM_HISI_HIBMC=m
@@@ -604,7 -616,6 +640,7 @@@ CONFIG_SND_HDA_CODEC_HDMI=
  CONFIG_SND_SOC=y
  CONFIG_SND_BCM2835_SOC_I2S=m
  CONFIG_SND_MESON_AXG_SOUND_CARD=m
 +CONFIG_SND_SOC_SDM845=m
  CONFIG_SND_SOC_ROCKCHIP=m
  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
  CONFIG_SND_SOC_ROCKCHIP_RT5645=m
@@@ -617,13 -628,11 +653,13 @@@ CONFIG_SND_SOC_ES7134=
  CONFIG_SND_SOC_ES7241=m
  CONFIG_SND_SOC_PCM3168A_I2C=m
  CONFIG_SND_SOC_TAS571X=m
 +CONFIG_SND_SOC_WCD934X=m
 +CONFIG_SND_SOC_WSA881X=m
  CONFIG_SND_SIMPLE_CARD=m
  CONFIG_SND_AUDIO_GRAPH_CARD=m
  CONFIG_I2C_HID=m
- CONFIG_USB=y
  CONFIG_USB_CONN_GPIO=m
+ CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_TEGRA=y
@@@ -633,7 -642,6 +669,7 @@@ CONFIG_USB_EHCI_HCD_PLATFORM=
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
 +CONFIG_USB_RENESAS_USBHS_HCD=m
  CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
  CONFIG_USB_MUSB_HDRC=y
@@@ -646,7 -654,6 +682,6 @@@ CONFIG_USB_CHIPIDEA_HOST=
  CONFIG_USB_ISP1760=y
  CONFIG_USB_HSIC_USB3503=y
  CONFIG_NOP_USB_XCEIV=y
- CONFIG_USB_ULPI=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_RENESAS_USB3=m
@@@ -694,11 -701,14 +729,14 @@@ CONFIG_LEDS_TRIGGER_PANIC=
  CONFIG_EDAC=y
  CONFIG_EDAC_GHES=y
  CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_DS1307=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
+ CONFIG_RTC_DRV_PCF85363=m
  CONFIG_RTC_DRV_RX8581=m
  CONFIG_RTC_DRV_S5M=y
  CONFIG_RTC_DRV_DS3232=y
+ CONFIG_RTC_DRV_PCF2127=m
  CONFIG_RTC_DRV_EFI=y
  CONFIG_RTC_DRV_CROS_EC=y
  CONFIG_RTC_DRV_S3C=y
@@@ -710,7 -720,7 +748,7 @@@ CONFIG_RTC_DRV_SNVS=
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
 -CONFIG_DMA_BCM2835=m
 +CONFIG_DMA_BCM2835=y
  CONFIG_DMA_SUN6I=m
  CONFIG_FSL_EDMA=y
  CONFIG_IMX_SDMA=y
@@@ -739,9 -749,7 +777,8 @@@ CONFIG_COMMON_CLK_RK808=
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_COMMON_CLK_CS2000_CP=y
  CONFIG_COMMON_CLK_S2MPS11=y
- CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_PWM=y
 +CONFIG_COMMON_CLK_VC5=y
  CONFIG_CLK_RASPBERRYPI=m
  CONFIG_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MN=y
@@@ -755,15 -763,12 +792,15 @@@ CONFIG_QCOM_CLK_APCS_MSM8916=
  CONFIG_QCOM_CLK_SMD_RPM=y
  CONFIG_QCOM_CLK_RPMH=y
  CONFIG_IPQ_GCC_8074=y
 +CONFIG_IPQ_GCC_6018=y
  CONFIG_MSM_GCC_8916=y
  CONFIG_MSM_GCC_8994=y
  CONFIG_MSM_MMCC_8996=y
  CONFIG_MSM_GCC_8998=y
  CONFIG_QCS_GCC_404=y
  CONFIG_SDM_GCC_845=y
 +CONFIG_SDM_GPUCC_845=y
 +CONFIG_SDM_DISPCC_845=y
  CONFIG_SM_GCC_8150=y
  CONFIG_QCOM_HFPLL=y
  CONFIG_HWSPINLOCK=y
@@@ -785,13 -790,12 +822,14 @@@ CONFIG_QCOM_SYSMON=
  CONFIG_RPMSG_QCOM_GLINK_RPM=y
  CONFIG_RPMSG_QCOM_GLINK_SMEM=m
  CONFIG_RPMSG_QCOM_SMD=y
 +CONFIG_SOUNDWIRE=m
 +CONFIG_SOUNDWIRE_QCOM=m
  CONFIG_OWL_PM_DOMAINS=y
  CONFIG_RASPBERRYPI_POWER=y
+ CONFIG_FSL_DPAA=y
+ CONFIG_FSL_MC_DPIO=y
  CONFIG_IMX_SCU_SOC=y
  CONFIG_QCOM_AOSS_QMP=y
- CONFIG_QCOM_COMMAND_DB=y
  CONFIG_QCOM_GENI_SE=y
  CONFIG_QCOM_GLINK_SSR=m
  CONFIG_QCOM_RMTFS_MEM=m
@@@ -802,19 -806,16 +840,18 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
  CONFIG_QCOM_SOCINFO=m
 +CONFIG_QCOM_APR=m
  CONFIG_ARCH_R8A774A1=y
  CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
 +CONFIG_ARCH_R8A77960=y
  CONFIG_ARCH_R8A77961=y
  CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A77980=y
  CONFIG_ARCH_R8A77990=y
  CONFIG_ARCH_R8A77995=y
- CONFIG_QCOM_PDC=y
  CONFIG_ROCKCHIP_PM_DOMAINS=y
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
@@@ -825,10 -826,8 +862,9 @@@ CONFIG_ARCH_K3_J721E_SOC=
  CONFIG_TI_SCI_PM_DOMAINS=y
  CONFIG_EXTCON_USB_GPIO=y
  CONFIG_EXTCON_USBC_CROS_EC=y
- CONFIG_MEMORY=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
 +CONFIG_MAX9611=m
  CONFIG_QCOM_SPMI_ADC5=m
  CONFIG_ROCKCHIP_SARADC=m
  CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@@@ -846,6 -845,7 +882,7 @@@ CONFIG_PWM_ROCKCHIP=
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_SUN4I=m
  CONFIG_PWM_TEGRA=m
+ CONFIG_QCOM_PDC=y
  CONFIG_RESET_QCOM_AOSS=y
  CONFIG_RESET_QCOM_PDC=m
  CONFIG_RESET_TI_SCI=y
@@@ -889,9 -889,7 +926,10 @@@ CONFIG_FPGA_REGION=
  CONFIG_OF_FPGA_REGION=m
  CONFIG_TEE=y
  CONFIG_OPTEE=y
 +CONFIG_SLIMBUS=m
 +CONFIG_SLIM_QCOM_CTRL=m
 +CONFIG_SLIM_QCOM_NGD_CTRL=m
+ CONFIG_MUX_MMIO=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
@@@ -920,17 -918,17 +958,18 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
+ CONFIG_CRYPTO_USER_API_RNG=m
  CONFIG_CRYPTO_DEV_SUN8I_CE=m
  CONFIG_CRYPTO_DEV_FSL_CAAM=m
- CONFIG_CRYPTO_DEV_HISI_ZIP=m
- CONFIG_CRYPTO_USER_API_RNG=m
+ CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
  CONFIG_CRYPTO_DEV_QCOM_RNG=m
 +CONFIG_CRYPTO_DEV_CCREE=m
+ CONFIG_CRYPTO_DEV_HISI_ZIP=m
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_INFO=y
- CONFIG_DEBUG_FS=y
  CONFIG_MAGIC_SYSRQ=y
+ CONFIG_DEBUG_FS=y
  CONFIG_DEBUG_KERNEL=y
  # CONFIG_SCHED_DEBUG is not set
  # CONFIG_DEBUG_PREEMPT is not set