From: Tom Rini <trini@konsulko.com>
Date: Fri, 10 Jul 2020 18:31:22 +0000 (-0400)
Subject: Merge tag 'rpi-next-2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspb... 
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=3113c84ba25ec3ceae072cc5ad450c4238425939;p=u-boot.git

Merge tag 'rpi-next-2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi

- add support for PCI and XHCI for RPi4 (64 bit only)
- optionally reset XHCI device on registration
- enable USB_KEYBOARD for rpi_4_defconfig
---

3113c84ba25ec3ceae072cc5ad450c4238425939
diff --cc configs/rpi_4_32b_defconfig
index 1c6b6f9b99,0df5c17d6e..db7b781976
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@@ -30,11 -26,9 +30,12 @@@ CONFIG_MMC_SDHCI_SDMA=
  CONFIG_MMC_SDHCI_BCM2835=y
  CONFIG_DM_ETH=y
  CONFIG_BCMGENET=y
 +CONFIG_PCI=y
 +CONFIG_DM_PCI=y
 +CONFIG_PCI_BRCMSTB=y
  CONFIG_PINCTRL=y
  # CONFIG_PINCTRL_GENERIC is not set
+ CONFIG_DM_RESET=y
  # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
  CONFIG_USB=y
  CONFIG_DM_USB=y