Merge tag 'xilinx-defconfig-for-6.20' of https://github.com/Xilinx/linux-xlnx into...

arm64: Xilinx defconfig changes for 6.20

- Enable missing drivers by default

* tag 'xilinx-defconfig-for-6.20' of https://github.com/Xilinx/linux-xlnx:
  arm64: defconfig: Drop duplicate CONFIG_OMAP_USB2 entry
  arm64: defconfig: Enable missing AMD/Xilinx drivers

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index 9e83893a2d1e7abd90e437cc219fc39d27d28642,cdb7d69e3b248975557e141481a88fd86115cf40..5112fc9f8fc6fc4d253a786dc623a2df8a83cc1d
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -233,9 -231,12 +233,13 @@@ CONFIG_PCIE_MEDIATEK_GEN3=
  CONFIG_PCI_TEGRA=y
  CONFIG_PCIE_RCAR_HOST=y
  CONFIG_PCIE_RCAR_EP=y
 +CONFIG_PCIE_RENESAS_RZG3S_HOST=y
  CONFIG_PCIE_ROCKCHIP_HOST=m
  CONFIG_PCI_XGENE=y
+ CONFIG_PCIE_XILINX=y
+ CONFIG_PCIE_XILINX_DMA_PL=y
+ CONFIG_PCIE_XILINX_NWL=y
+ CONFIG_PCIE_XILINX_CPM=y
  CONFIG_PCI_IMX6_HOST=y
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y
@@@ -606,11 -609,11 +616,13 @@@ CONFIG_SPI_STM32_OSPI=
  CONFIG_SPI_SUN6I=y
  CONFIG_SPI_TEGRA210_QUAD=m
  CONFIG_SPI_TEGRA114=m
+ CONFIG_SPI_XILINX=m
+ CONFIG_SPI_ZYNQMP_GQSPI=m
  CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
 +CONFIG_SPMI_APPLE=m
  CONFIG_SPMI_MTK_PMIF=m
 +CONFIG_PINCTRL_APPLE_GPIO=m
  CONFIG_PINCTRL_BRCMSTB=y
  CONFIG_PINCTRL_BCM2712=y
  CONFIG_PINCTRL_DA9062=m