Merge tag 'v2023.04-rc3' into next
authorTom Rini <trini@konsulko.com>
Mon, 27 Feb 2023 22:28:21 +0000 (17:28 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 27 Feb 2023 22:28:21 +0000 (17:28 -0500)
Prepare v2023.04-rc3

1  2 
configs/uniphier_v7_defconfig
drivers/usb/dwc3/dwc3-generic.c

@@@ -80,8 -78,11 +78,10 @@@ CONFIG_SNI_AVE=
  CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_UNIPHIER_SPI=y
+ CONFIG_TIMER=y
+ CONFIG_SPL_TIMER=y
  CONFIG_USB=y
  CONFIG_USB_XHCI_HCD=y
 -CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_GENERIC=y
  CONFIG_USB_DWC3=y
Simple merge