Merge tag 'ti-k3-config-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel...

TI K3 defconfig updates for v6.20

- Enable configurations for Kontron SMARC-sAM67 module support

* tag 'ti-k3-config-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  arm64: defconfig: Enable configurations for Kontron SMARC-sAM67

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

diff --cc arch/arm64/configs/defconfig
index c0e0caa4d767778bc49ea685a0364f5881dcfc4a,7823b74970ffabab28c9dc27fbf59165cda39b36..d88aaa3f9919d029aa056bba92737c59e680ddd4
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -233,13 -231,9 +233,14 @@@ 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_J721E_HOST=m
  CONFIG_PCI_IMX6_HOST=y
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y