armsr: armv8: fix NXP/Freescale i.MX family configuration

Due to an error on my part, Anton Antonov's
i.MX changes[1] did not fully make it into my
armvirt kernel 6.1 EFI pull request. I have updated
them using the options he supplied[1] as well
as comparing to the Linux arm64 defconfig.

The notable exception is:
CONFIG_USB_DWC3_OF_SIMPLE currently disabled
due to an issue with i.MX8P and i.MX8Q.

Fixes: 3efb3b80 ("armvirt: 64: Add NXP i.MX 8M Mini/Nano/Quad/Plus EVK support")
Signed-off-by: NMathew McBride <matt@traverse.com.au>

[1] - https://github.com/anta5010/openwrt/commit/ccf826c3444fd5fa8fac08aac05f66568ae0c242

target/linux/armsr/armv8/config-6.1

 CONFIG_64BIT=y
 CONFIG_ACPI_HMAT=y
 CONFIG_ACPI_PCC=y
+CONFIG_AHCI_IMX=y
 CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_INTEL_SOCFPGA=y
@@ -11,6 +12,7 @@ CONFIG_ARCH_MMAP_RND_BITS_MAX=24
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_MXC=y
 CONFIG_ARCH_NXP=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ARCH_ROCKCHIP=y
@@ -107,6 +109,13 @@ CONFIG_CAVIUM_ERRATUM_27456=y
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_CLK_IMX8MN=y
+CONFIG_CLK_IMX8MP=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
+CONFIG_CLK_IMX8ULP=y
+CONFIG_CLK_IMX93=y
 CONFIG_CLK_INTEL_SOCFPGA=y
 CONFIG_CLK_INTEL_SOCFPGA64=y
 CONFIG_CLK_LS1028A_PLLDIG=y
@@ -194,7 +203,14 @@ CONFIG_DMA_SUN6I=y
 CONFIG_DRM=y
 CONFIG_DRM_BOCHS=y
 CONFIG_DRM_BRIDGE=y
+# CONFIG_DRM_FSL_LDB is not set
 CONFIG_DRM_GEM_SHMEM_HELPER=y
+# CONFIG_DRM_IMX8QM_LDB is not set
+# CONFIG_DRM_IMX8QXP_LDB is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_LINK is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set
+# CONFIG_DRM_IMX_DCSS is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -220,6 +236,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_MX3=y
 # CONFIG_FB_XILINX is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FSL_DPAA is not set
@@ -235,6 +252,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MPC8XXX=y
+CONFIG_GPIO_MXC=y
 CONFIG_GPIO_ROCKCHIP=y
 CONFIG_GPIO_THUNDERX=y
 CONFIG_GPIO_XLP=y
@@ -257,16 +275,37 @@ CONFIG_I2C_ALTERA=y
 CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_HIX5HD2 is not set
 CONFIG_I2C_IMX=y
+CONFIG_I2C_IMX_LPI2C=y
 # CONFIG_I2C_SLAVE_TESTUNIT is not set
 CONFIG_I2C_SYNQUACER=y
 CONFIG_I2C_THUNDERX=y
 # CONFIG_I2C_XLP9XX is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMX2_WDT is not set
+# CONFIG_IMX8MM_THERMAL is not set
+# CONFIG_IMX8QXP_ADC is not set
+# CONFIG_IMX_DMA is not set
+# CONFIG_IMX_DSP is not set
+CONFIG_IMX_INTMUX=y
+CONFIG_IMX_IRQSTEER=y
+CONFIG_IMX_MBOX=y
+# CONFIG_IMX_MU_MSI is not set
+CONFIG_IMX_SCU=y
+CONFIG_IMX_SCU_PD=y
+# CONFIG_IMX_SC_THERMAL is not set
+# CONFIG_IMX_SC_WDT is not set
+# CONFIG_IMX_SDMA is not set
+# CONFIG_IMX_WEIM is not set
 # CONFIG_INPUT_HISI_POWERKEY is not set
 # CONFIG_INPUT_IBM_PANEL is not set
 # CONFIG_INTEL_STRATIX10_RSU is not set
 # CONFIG_INTEL_STRATIX10_SERVICE is not set
+CONFIG_INTERCONNECT=y
+CONFIG_INTERCONNECT_IMX=y
+CONFIG_INTERCONNECT_IMX8MM=y
+CONFIG_INTERCONNECT_IMX8MN=y
+CONFIG_INTERCONNECT_IMX8MP=y
+CONFIG_INTERCONNECT_IMX8MQ=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
@@ -277,6 +316,7 @@ CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_K3_DMA is not set
 CONFIG_KCMP=y
+# CONFIG_KEYBOARD_IMX_SC_KEY is not set
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 CONFIG_KSM=y
 CONFIG_KVM=y
@@ -299,6 +339,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_CAVIUM_THUNDERX=y
 CONFIG_MMC_DW=y
 # CONFIG_MMC_DW_BLUEFIELD is not set
@@ -308,9 +349,12 @@ CONFIG_MMC_DW=y
 # CONFIG_MMC_DW_PCI is not set
 CONFIG_MMC_DW_PLTFM=y
 CONFIG_MMC_DW_ROCKCHIP=y
+# CONFIG_MMC_MXC is not set
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_CADENCE=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -319,9 +363,14 @@ CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MVNETA is not set
 # CONFIG_MVPP2 is not set
 # CONFIG_MV_XOR is not set
+# CONFIG_MX3_IPU is not set
+CONFIG_MXC_CLK=y
+CONFIG_MXC_CLK_SCU=y
+# CONFIG_MXS_DMA is not set
 CONFIG_NEED_SG_DMA_LENGTH=y
 # CONFIG_NET_VENDOR_ALLWINNER is not set
 CONFIG_NODES_SHIFT=4
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
@@ -331,9 +380,13 @@ CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
+# CONFIG_NVMEM_IMX_IIM is not set
+# CONFIG_NVMEM_IMX_OCOTP_ELE is not set
+CONFIG_NVMEM_IMX_OCOTP_SCU=y
 # CONFIG_NVMEM_LAYERSCAPE_SFP is not set
 CONFIG_NVMEM_ROCKCHIP_EFUSE=y
 # CONFIG_NVMEM_ROCKCHIP_OTP is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_NVMEM_SUNXI_SID is not set
 # CONFIG_NVMEM_ZYNQMP is not set
 CONFIG_PCC=y
@@ -346,7 +399,9 @@ CONFIG_PCIE_ROCKCHIP_HOST=y
 CONFIG_PCIE_XILINX_CPM=y
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCI_AARDVARK=y
+CONFIG_PCI_IMX6=y
 CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PHY_FSL_IMX8M_PCIE=y
 # CONFIG_PHY_FSL_LYNX_28G is not set
 CONFIG_PHY_HI3660_USB=y
 CONFIG_PHY_HI3670_PCIE=y
@@ -354,6 +409,7 @@ CONFIG_PHY_HI3670_USB=y
 CONFIG_PHY_HI6220_USB=y
 CONFIG_PHY_HISI_INNO_USB2=y
 # CONFIG_PHY_HISTB_COMBPHY is not set
+# CONFIG_PHY_MIXEL_LVDS_PHY is not set
 CONFIG_PHY_MVEBU_A3700_COMPHY=y
 CONFIG_PHY_MVEBU_A3700_UTMI=y
 CONFIG_PHY_MVEBU_A38X_COMPHY=y
@@ -375,6 +431,19 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_PHY_SUN6I_MIPI_DPHY is not set
 CONFIG_PHY_SUN9I_USB=y
 # CONFIG_PHY_XILINX_ZYNQMP is not set
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX8DXL=y
+CONFIG_PINCTRL_IMX8MM=y
+CONFIG_PINCTRL_IMX8MN=y
+CONFIG_PINCTRL_IMX8MP=y
+CONFIG_PINCTRL_IMX8MQ=y
+CONFIG_PINCTRL_IMX8QM=y
+CONFIG_PINCTRL_IMX8QXP=y
+CONFIG_PINCTRL_IMX8ULP=y
+CONFIG_PINCTRL_IMX93=y
+# CONFIG_PINCTRL_IMXRT1050 is not set
+# CONFIG_PINCTRL_IMXRT1170 is not set
+CONFIG_PINCTRL_IMX_SCU=y
 CONFIG_PINCTRL_ROCKCHIP=y
 # CONFIG_PINCTRL_SUN20I_D1 is not set
 CONFIG_PINCTRL_SUN4I_A10=y
@@ -418,8 +487,14 @@ CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_ANATOP=y
 CONFIG_REGULATOR_AXP20X=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_HI655X=y
+CONFIG_REGULATOR_PFUZE100=y
+# CONFIG_REGULATOR_VEXPRESS is not set
+CONFIG_RESET_IMX7=y
 CONFIG_ROCKCHIP_IODOMAIN=y
 CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_ROCKCHIP_MBOX is not set
@@ -428,7 +503,11 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
 # CONFIG_ROCKCHIP_THERMAL is not set
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_RTC_DRV_FSL_FTM_ALARM is not set
+# CONFIG_RTC_DRV_IMXDI is not set
+# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_MV=y
+# CONFIG_RTC_DRV_MXC is not set
+# CONFIG_RTC_DRV_MXC_V2 is not set
 CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_SCHED_CORE is not set
 CONFIG_SCHED_MC=y
@@ -437,8 +516,13 @@ CONFIG_SCHED_SMT=y
 # CONFIG_SERIAL_8250_EXAR is not set
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_FSL_LINFLEXUART=y
+CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_EARLYCON=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_SAMSUNG=y
@@ -451,15 +535,19 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SNI_NETSEC is not set
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
+CONFIG_SOC_IMX8M=y
+CONFIG_SOC_IMX9=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPI_ARMADA_3700=y
+CONFIG_SPI_FSL_LPSPI=y
 # CONFIG_SPI_FSL_QUADSPI is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
 # CONFIG_SPI_HISI_SFC is not set
 # CONFIG_SPI_HISI_SFC_V3XX is not set
+CONFIG_SPI_IMX=y
 # CONFIG_SPI_ROCKCHIP_SFC is not set
 # CONFIG_SPI_SUN4I is not set
 # CONFIG_SPI_SUN6I is not set
@@ -494,10 +582,51 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 # CONFIG_TURRIS_MOX_RWTM is not set
+CONFIG_TYPEC=y
+# CONFIG_TYPEC_ANX7411 is not set
+# CONFIG_TYPEC_DP_ALTMODE is not set
+# CONFIG_TYPEC_FUSB302 is not set
+# CONFIG_TYPEC_HD3SS3220 is not set
+# CONFIG_TYPEC_MUX_FSA4480 is not set
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+# CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_RT1719 is not set
+# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_TCPCI=y
+# CONFIG_TYPEC_TCPCI_MAXIM is not set
+CONFIG_TYPEC_TCPM=y
+# CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_WUSB3801 is not set
 # CONFIG_UACCE is not set
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_GENERIC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_IMX=y
+CONFIG_USB_CHIPIDEA_PCI=y
+CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_DUAL_ROLE=y
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_HAPS=y
+# CONFIG_USB_DWC3_HOST is not set
+CONFIG_USB_DWC3_IMX8MP=y
+# CONFIG_USB_DWC3_OF_SIMPLE is not set
+CONFIG_USB_DWC3_PCI=y
+# CONFIG_USB_DWC3_ULPI is not set
 CONFIG_USB_DWC3_XILINX=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_ORION=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_USB_OHCI_EXYNOS=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_OTG=y
+CONFIG_USB_OTG_FSM=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_HISTB=y
 CONFIG_USB_XHCI_MVEBU=y