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

i.MX defconfig change for 6.11:

- Enable a few drivers needed by TQMa7x/MBa7x and i.MX53 QSB/QSRB in
  imx_v6_v7_defconfig
- Enable IWLWIFI driver support in arm64 defconfig

* tag 'imx-defconfig-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: Enable the IWLWIFI driver
  ARM: imx_v6_v7_defconfig: enable DRM_SII902X and DRM_DISPLAY_CONNECTOR
  ARM: imx_v6_v7_defconfig: Enable drivers for TQMa7x/MBa7x

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm64/configs/defconfig
index 130e929023015d07e10961de9dd88d7d20411fcf,9964e5172b922710caa8ea09afade33dfeb59bd8..080739294b18865e8cbc1d68fe1e675cca7137bc
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -233,8 -233,6 +233,8 @@@ CONFIG_PCIE_HISI_STB=
  CONFIG_PCIE_ARMADA_8K=y
  CONFIG_PCIE_TEGRA194_HOST=m
  CONFIG_PCIE_QCOM=y
 +CONFIG_PCIE_RCAR_GEN4_HOST=m
 +CONFIG_PCIE_RCAR_GEN4_EP=m
  CONFIG_PCIE_ROCKCHIP_DW_HOST=y
  CONFIG_PCIE_VISCONTI_HOST=y
  CONFIG_PCIE_LAYERSCAPE_GEN4=y
@@@ -258,7 -256,6 +258,7 @@@ CONFIG_GOOGLE_CBMEM=
  CONFIG_GOOGLE_COREBOOT_TABLE=m
  CONFIG_EFI_CAPSULE_LOADER=y
  CONFIG_IMX_SCU=y
 +CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
  CONFIG_QCOM_QSEECOM=y
  CONFIG_QCOM_QSEECOM_UEFISECAPP=y
  CONFIG_GNSS=m
@@@ -282,8 -279,6 +282,8 @@@ CONFIG_MTD_NAND_FSL_IFC=
  CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_MTD_UBI=m
 +CONFIG_MTD_HYPERBUS=m
 +CONFIG_HBMC_AM654=m
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
@@@ -380,7 -375,6 +380,7 @@@ CONFIG_AQUANTIA_PHY=
  CONFIG_BCM54140_PHY=m
  CONFIG_MARVELL_PHY=m
  CONFIG_MARVELL_10G_PHY=y
 +CONFIG_MARVELL_88Q2XXX_PHY=y
  CONFIG_MICREL_PHY=y
  CONFIG_MICROSEMI_PHY=y
  CONFIG_AT803X_PHY=y
@@@ -420,6 -414,9 +420,9 @@@ CONFIG_ATH11K_AHB=
  CONFIG_ATH11K_PCI=m
  CONFIG_ATH12K=m
  CONFIG_BRCMFMAC=m
+ CONFIG_IWLWIFI=m
+ CONFIG_IWLDVM=m
+ CONFIG_IWLMVM=m
  CONFIG_MWIFIEX=m
  CONFIG_MWIFIEX_SDIO=m
  CONFIG_MWIFIEX_PCIE=m
@@@ -751,7 -748,6 +754,7 @@@ CONFIG_MFD_SEC_CORE=
  CONFIG_MFD_SL28CPLD=y
  CONFIG_RZ_MTU3=y
  CONFIG_MFD_TI_AM335X_TSCADC=m
 +CONFIG_MFD_TI_LP873X=m
  CONFIG_MFD_TPS65219=y
  CONFIG_MFD_TPS6594_I2C=m
  CONFIG_MFD_ROHM_BD718XX=y
@@@ -767,7 -763,6 +770,7 @@@ CONFIG_REGULATOR_FAN53555=
  CONFIG_REGULATOR_GPIO=y
  CONFIG_REGULATOR_HI6421V530=y
  CONFIG_REGULATOR_HI655X=y
 +CONFIG_REGULATOR_LP873X=m
  CONFIG_REGULATOR_MAX77620=y
  CONFIG_REGULATOR_MAX8973=y
  CONFIG_REGULATOR_MAX20411=m
@@@ -1070,7 -1065,6 +1073,7 @@@ CONFIG_USB_MTU3=
  CONFIG_USB_MUSB_HDRC=y
  CONFIG_USB_MUSB_SUNXI=y
  CONFIG_USB_DWC3=y
 +CONFIG_OMAP_USB2=m
  CONFIG_USB_DWC2=y
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_UDC=y
@@@ -1224,7 -1218,6 +1227,7 @@@ CONFIG_QCOM_BAM_DMA=
  CONFIG_QCOM_GPI_DMA=m
  CONFIG_QCOM_HIDMA_MGMT=y
  CONFIG_QCOM_HIDMA=y
 +CONFIG_DW_EDMA=m
  CONFIG_RCAR_DMAC=y
  CONFIG_RENESAS_USB_DMAC=m
  CONFIG_RZ_DMAC=y
@@@ -1343,7 -1336,6 +1346,7 @@@ CONFIG_SM_GCC_8650=
  CONFIG_SM_GPUCC_6115=m
  CONFIG_SM_GPUCC_8150=y
  CONFIG_SM_GPUCC_8250=y
 +CONFIG_SM_GPUCC_8350=m
  CONFIG_SM_GPUCC_8450=m
  CONFIG_SM_GPUCC_8550=m
  CONFIG_SM_GPUCC_8650=m
@@@ -1566,7 -1558,6 +1569,7 @@@ CONFIG_ARM_SPE_PMU=
  CONFIG_ARM_DMC620_PMU=m
  CONFIG_HISI_PMU=y
  CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 +CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
  CONFIG_MESON_DDR_PMU=m
  CONFIG_NVMEM_LAYOUT_SL28_VPD=m
  CONFIG_NVMEM_IMX_OCOTP=y
@@@ -1576,7 -1567,6 +1579,7 @@@ CONFIG_NVMEM_LAYERSCAPE_SFP=
  CONFIG_NVMEM_MESON_EFUSE=m
  CONFIG_NVMEM_MTK_EFUSE=y
  CONFIG_NVMEM_QCOM_QFPROM=y
 +CONFIG_NVMEM_QCOM_SEC_QFPROM=m
  CONFIG_NVMEM_RMEM=m
  CONFIG_NVMEM_ROCKCHIP_EFUSE=y
  CONFIG_NVMEM_ROCKCHIP_OTP=y
@@@ -1606,7 -1596,7 +1609,7 @@@ CONFIG_INTERCONNECT_IMX8MQ=
  CONFIG_INTERCONNECT_IMX8MP=y
  CONFIG_INTERCONNECT_QCOM=y
  CONFIG_INTERCONNECT_QCOM_MSM8916=m
 -CONFIG_INTERCONNECT_QCOM_MSM8996=m
 +CONFIG_INTERCONNECT_QCOM_MSM8996=y
  CONFIG_INTERCONNECT_QCOM_OSM_L3=m
  CONFIG_INTERCONNECT_QCOM_QCM2290=y
  CONFIG_INTERCONNECT_QCOM_QCS404=m
@@@ -1619,9 -1609,9 +1622,9 @@@ CONFIG_INTERCONNECT_QCOM_SC8280XP=
  CONFIG_INTERCONNECT_QCOM_SDM845=y
  CONFIG_INTERCONNECT_QCOM_SDX75=y
  CONFIG_INTERCONNECT_QCOM_SM6115=y
 -CONFIG_INTERCONNECT_QCOM_SM8150=m
 +CONFIG_INTERCONNECT_QCOM_SM8150=y
  CONFIG_INTERCONNECT_QCOM_SM8250=y
 -CONFIG_INTERCONNECT_QCOM_SM8350=m
 +CONFIG_INTERCONNECT_QCOM_SM8350=y
  CONFIG_INTERCONNECT_QCOM_SM8450=y
  CONFIG_INTERCONNECT_QCOM_SM8550=y
  CONFIG_INTERCONNECT_QCOM_SM8650=y