linux-toradex-mainline: aarch64: re-add nvme, overlay fs, pci and sata

Re-add NVMe, overlay FS, PCI (incl. some Ethernet and Wi-Fi drivers) and
SATA. Dropp i.MX 93 ADC instead.

Fixes: 881fef18ce8a ("linux-toradex-mainline-git: extend defconfig for verdin am62")

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

2 files changed, 73 insertions, 22 deletions

diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/defconfig b/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/defconfig
index 40a53fe..d5eb80e 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/defconfig
+++ b/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/defconfig
@@ -63,6 +63,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HMAT=y
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 CONFIG_VIRTUALIZATION=y
@@ -125,10 +126,8 @@ CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_GATE=m
 CONFIG_NET_SWITCHDEV=y
-CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_QRTR_TUN=m
-CONFIG_QRTR_MHI=m
 CONFIG_CAN=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
@@ -155,11 +154,24 @@ CONFIG_RFKILL=m
 CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PASID=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCI_IMX6_HOST=y
+CONFIG_PCI_HISI=y
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+CONFIG_PCI_EPF_TEST=m
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_VEXPRESS_CONFIG=y
-CONFIG_MHI_BUS=m
+CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_EFI_CAPSULE_LOADER=y
@@ -170,19 +182,25 @@ CONFIG_GNSS_MTK_SERIAL=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_NVME=m
 CONFIG_SRAM=y
+CONFIG_PCI_ENDPOINT_TEST=m
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=m
 CONFIG_UACCE=m
-CONFIG_RAID_ATTRS=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_ATA=y
+CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_DWC=m
 CONFIG_AHCI_CEVA=y
+CONFIG_SATA_SIL24=y
 CONFIG_PATA_OF_PLATFORM=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
@@ -196,41 +214,70 @@ CONFIG_TUN=y
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=y
 CONFIG_MHI_NET=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
 # CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
 # CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_AQUANTIA is not set
 # CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 CONFIG_FEC=y
 CONFIG_FSL_XGMAC_MDIO=y
-CONFIG_FSL_ENETC_IERB=y
+CONFIG_FSL_ENETC=y
+CONFIG_FSL_ENETC_VF=y
+CONFIG_FSL_ENETC_QOS=y
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
+CONFIG_E1000=y
+CONFIG_E1000E=y
+CONFIG_IGB=y
+CONFIG_IGBVF=y
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MYRI is not set
 # CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
 # CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+CONFIG_R8169=m
 # CONFIG_NET_VENDOR_RENESAS is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_STMMAC_ETH=m
+# CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
 CONFIG_TI_K3_AM65_CPSW_NUSS=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
@@ -255,6 +302,7 @@ CONFIG_CAN_M_CAN_PLATFORM=m
 CONFIG_CAN_MCP251XFD=m
 CONFIG_MDIO_BCM_UNIMAC=y
 CONFIG_MDIO_GPIO=y
+CONFIG_MDIO_THUNDER=y
 CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_USB_PEGASUS=m
@@ -269,20 +317,28 @@ CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_MCS7830=m
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
-# CONFIG_WLAN_VENDOR_ATH is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_WCN36XX=m
+CONFIG_ATH11K=m
+CONFIG_ATH11K_AHB=m
+CONFIG_ATH11K_PCI=m
 # CONFIG_WLAN_VENDOR_ATMEL is not set
-# CONFIG_WLAN_VENDOR_BROADCOM is not set
+CONFIG_BRCMFMAC=m
 # CONFIG_WLAN_VENDOR_CISCO is not set
 # CONFIG_WLAN_VENDOR_INTEL is not set
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
-# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+CONFIG_MT7921E=m
 # CONFIG_WLAN_VENDOR_RALINK is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
+CONFIG_WL18XX=m
+CONFIG_WLCORE_SDIO=m
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
 CONFIG_WWAN=m
@@ -341,7 +397,6 @@ CONFIG_TCG_TIS_SPI=m
 CONFIG_TCG_TIS_SPI_CR50=y
 CONFIG_TCG_TIS_I2C_CR50=m
 CONFIG_TCG_TIS_I2C_INFINEON=y
-CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
@@ -652,6 +707,7 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
@@ -724,6 +780,8 @@ CONFIG_QCOM_HIDMA=y
 CONFIG_TI_K3_UDMA=y
 CONFIG_TI_K3_UDMA_GLUE_LAYER=y
 CONFIG_VFIO=y
+CONFIG_VFIO_PCI=y
+CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_XEN_GNTDEV=y
@@ -838,6 +896,7 @@ CONFIG_NVMEM_RMEM=m
 CONFIG_NVMEM_SNVS_LPGPR=y
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_FPGA=y
+CONFIG_FPGA_MGR_ALTERA_CVP=m
 CONFIG_FPGA_BRIDGE=m
 CONFIG_ALTERA_FREEZE_BRIDGE=m
 CONFIG_FPGA_REGION=m
@@ -871,7 +930,6 @@ CONFIG_NTFS_FS=m
 CONFIG_NTFS_RW=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
-CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_NFS_FS=y
@@ -885,8 +943,6 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_SECURITY=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_DEFLATE=m
@@ -907,6 +963,9 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_DEV_FSL_CAAM=m
 CONFIG_CRYPTO_DEV_CCREE=m
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
+CONFIG_CRYPTO_DEV_HISI_HPRE=m
 CONFIG_CRYPTO_DEV_HISI_TRNG=m
 CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
 CONFIG_CRYPTO_DEV_SA2UL=m
@@ -915,7 +974,6 @@ CONFIG_INDIRECT_PIO=y
 CONFIG_CRC_CCITT=m
 CONFIG_DMA_RESTRICTED_POOL=y
 CONFIG_CMA_SIZE_MBYTES=32
-CONFIG_IRQ_POLL=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_KERNEL=y
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/toradex_aarch64.config b/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/toradex_aarch64.config
index bacb174..18004de 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/toradex_aarch64.config
+++ b/recipes-kernel/linux/linux-toradex-mainline-git/aarch64/toradex_aarch64.config
@@ -121,7 +121,7 @@ CONFIG_RPMSG_TTY=m
 CONFIG_SAMPLES=y
 CONFIG_SAMPLE_RPMSG_CLIENT=m
 
-# Enable i.MX PCIE
+# Enable i.MX PCIe
 CONFIG_PCI_IMX6_HOST=y
 
 # Enable new LCDIF driver for i.MX 8M series SoCs
@@ -380,7 +380,6 @@ CONFIG_SND_SOC_WM8978=n
 CONFIG_SND_SOC_WSA881X=n
 
 # Not used PCI drivers
-CONFIG_PCI=n
 CONFIG_PCI_HOST_THUNDER_ECAM=n
 CONFIG_PCI_HOST_THUNDER_PEM=n
 CONFIG_PCI_LAYERSCAPE=n
@@ -391,7 +390,6 @@ CONFIG_PCIE_ALTERA_MSI=n
 CONFIG_PCIE_ALTERA=n
 CONFIG_PCIE_KIRIN=n
 CONFIG_PCIE_MOBIVEIL=n
-CONFIG_PCI_ENDPOINT=n
 
 # Not used Graphic Drivers
 CONFIG_DRM_RCAR_DW_HDMI=n
@@ -448,7 +446,6 @@ CONFIG_NET_VENDOR_PENSANDO=n
 CONFIG_NET_VENDOR_QLOGIC=n
 CONFIG_NET_VENDOR_QUALCOMM=n
 CONFIG_NET_VENDOR_RDC=n
-CONFIG_NET_VENDOR_REALTEK=n
 CONFIG_NET_VENDOR_RENESAS=n
 CONFIG_NET_VENDOR_ROCKER=n
 CONFIG_NET_VENDOR_SAMSUNG=n
@@ -464,16 +461,12 @@ CONFIG_NET_VENDOR_TEHUTI=n
 CONFIG_NET_VENDOR_VIA=n
 CONFIG_NET_VENDOR_WIZNET=n
 CONFIG_WLAN_VENDOR_ADMTEK=n
-CONFIG_WLAN_VENDOR_ATH=n
 CONFIG_WLAN_VENDOR_ATMEL=n
-CONFIG_WLAN_VENDOR_BROADCOM=n
 CONFIG_WLAN_VENDOR_CISCO=n
 CONFIG_WLAN_VENDOR_INTEL=n
 CONFIG_WLAN_VENDOR_INTERSIL=n
-CONFIG_WLAN_VENDOR_MEDIATEK=n
 CONFIG_WLAN_VENDOR_QUANTENNA=n
 CONFIG_WLAN_VENDOR_RALINK=n
 CONFIG_WLAN_VENDOR_RSI=n
 CONFIG_WLAN_VENDOR_ST=n
-CONFIG_WLAN_VENDOR_TI=n
 CONFIG_WLAN_VENDOR_ZYDAS=n