From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Feb 2023 20:07:00 +0000 (-0800)
Subject: Merge tag 'usb-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=72bffe7e1eb6cb82b90aa14cd786f3f5ede9e0ae;p=linux.git

Merge tag 'usb-6.3-rc1' of git://git./linux/kernel/git/gregkh/usb

Pull USB / Thunderbolt driver updates from Greg KH:
 "Here is the big set of USB and Thunderbolt driver changes for 6.3-rc1.

  Nothing major in here, just lots of good development, including:

   - Thunderbolt additions for new device support and features

   - xhci driver updates and cleanups

   - USB gadget media driver updates (includes media core changes that
     were acked by the v4l2 maintainers)

   - lots of other USB gadget driver updates for new features

   - dwc3 driver updates and fixes

   - minor debugfs leak fixes

   - typec driver updates and additions

   - dt-bindings conversions to yaml

   - other small bugfixes and driver updates

  All have been in linux-next for a while with no reported issues"

* tag 'usb-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (237 commits)
  usb: dwc3: xilinx: Remove unused of_gpio,h
  usb: typec: pd: Add higher capability sysfs for sink PDO
  usb: typec: pd: Remove usb_suspend_supported sysfs from sink PDO
  usb: dwc3: pci: add support for the Intel Meteor Lake-M
  usb: gadget: u_ether: Don't warn in gether_setup_name_default()
  usb: gadget: u_ether: Convert prints to device prints
  usb: gadget: u_serial: Add null pointer check in gserial_resume
  usb: gadget: uvc: fix missing mutex_unlock() if kstrtou8() fails
  xhci: host: potential NULL dereference in xhci_generic_plat_probe()
  dt-bindings: usb: amlogic,meson-g12a-usb-ctrl: make G12A usb3-phy0 optional
  usb: host: fsl-mph-dr-of: reuse device_set_of_node_from_dev
  of: device: Do not ignore error code in of_device_uevent_modalias
  of: device: Ignore modalias of reused nodes
  usb: gadget: configfs: Fix set but not used variable warning
  usb: gadget: uvc: Use custom strings if available
  usb: gadget: uvc: Allow linking function to string descs
  usb: gadget: uvc: Pick up custom string descriptor IDs
  usb: gadget: uvc: Allow linking XUs to string descriptors
  usb: gadget: configfs: Attach arbitrary strings to cdev
  usb: gadget: configfs: Support arbitrary string descriptors
  ...
---

72bffe7e1eb6cb82b90aa14cd786f3f5ede9e0ae
diff --cc arch/arm64/configs/defconfig
index 989183c76ae0b,7eb5b6df594ec..7e0487bbdaa04
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -936,8 -922,8 +936,9 @@@ CONFIG_USB_SERIAL=
  CONFIG_USB_SERIAL_CP210X=m
  CONFIG_USB_SERIAL_FTDI_SIO=m
  CONFIG_USB_SERIAL_OPTION=m
 +CONFIG_USB_QCOM_EUD=m
  CONFIG_USB_HSIC_USB3503=y
+ CONFIG_USB_ONBOARD_HUB=m
  CONFIG_NOP_USB_XCEIV=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
@@@ -960,7 -946,8 +961,9 @@@ CONFIG_TYPEC_TCPCI=
  CONFIG_TYPEC_FUSB302=m
  CONFIG_TYPEC_TPS6598X=m
  CONFIG_TYPEC_HD3SS3220=m
+ CONFIG_TYPEC_UCSI=m
+ CONFIG_UCSI_CCG=m
 +CONFIG_TYPEC_MUX_GPIO_SBU=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
diff --cc drivers/usb/gadget/udc/Makefile
index 239ea22bdfd92,d40822a12bad0..ee569f63c74ae
--- a/drivers/usb/gadget/udc/Makefile
+++ b/drivers/usb/gadget/udc/Makefile
@@@ -26,7 -27,10 +26,9 @@@ obj-$(CONFIG_USB_TEGRA_XUDC)	+= tegra-x
  obj-$(CONFIG_USB_M66592)	+= m66592-udc.o
  obj-$(CONFIG_USB_R8A66597)	+= r8a66597-udc.o
  obj-$(CONFIG_USB_RENESAS_USB3)	+= renesas_usb3.o
+ obj-$(CONFIG_USB_RZV2M_USB3DRD)	+= rzv2m_usb3drd.o
+ obj-$(CONFIG_USB_RENESAS_USBF)	+= renesas_usbf.o
  obj-$(CONFIG_USB_FSL_QE)	+= fsl_qe_udc.o
 -obj-$(CONFIG_USB_S3C_HSUDC)	+= s3c-hsudc.o
  obj-$(CONFIG_USB_LPC32XX)	+= lpc32xx_udc.o
  obj-$(CONFIG_USB_EG20T)		+= pch_udc.o
  obj-$(CONFIG_USB_MV_UDC)	+= mv_udc.o