Merge tag 'v2023.04-rc3' into next

Prepare v2023.04-rc3

diff --cc configs/uniphier_v7_defconfig
index 03feb04b93785172164dee3da008a8c0a9ec54c7,501d0ebdd577b53170aef3a2a864dc6f0c5adc72..b7b86b668c016365ddf1789ffa2f2fe6c7a26588
--- 1/configs/uniphier_v7_defconfig
--- 2/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig
@@@ -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

diff --cc drivers/usb/dwc3/dwc3-generic.c
Simple merge