]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'usb-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Dec 2025 02:42:12 +0000 (18:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Dec 2025 02:42:12 +0000 (18:42 -0800)
Pull USB/Thunderbolt updates from Greg KH:
 "Here is the big set of USB and Thunderbolt driver updates for
  6.19-rc1. Nothing major here, just lots of tiny updates for most of
  the common USB drivers. Included in here are:

   - more xhci driver updates and fixes

   - Thunderbolt driver cleanups

   - usb serial driver updates

   - typec driver updates

   - USB tracepoint additions

   - dwc3 driver updates, including support for Apple hardware

   - lots of other smaller driver updates and cleanups

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

* tag 'usb-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (161 commits)
  usb: gadget: tegra-xudc: Always reinitialize data toggle when clear halt
  USB: serial: option: move Telit 0x10c7 composition in the right place
  USB: serial: option: add Telit Cinterion FE910C04 new compositions
  usb: typec: ucsi: fix use-after-free caused by uec->work
  usb: typec: ucsi: fix probe failure in gaokun_ucsi_probe()
  usb: dwc3: core: Remove redundant comment in core init
  usb: phy: Initialize struct usb_phy list_head
  USB: serial: option: add Foxconn T99W760
  usb: usb-storage: No additional quirks need to be added to the EL-R12 optical drive.
  usb: typec: hd3ss3220: Enable VBUS based on ID pin state
  dt-bindings: usb: ti,hd3ss3220: Add support for VBUS based on ID state
  usb: typec: anx7411: add WQ_PERCPU to alloc_workqueue users
  USB: add WQ_PERCPU to alloc_workqueue users
  dt-bindings: usb: dwc3-xilinx: Describe the reset constraint for the versal platform
  drivers/usb/storage: use min() instead of min_t()
  usb: raw-gadget: cap raw_io transfer length to KMALLOC_MAX_SIZE
  usb: ohci-da8xx: remove unused platform data
  usb: gadget: functionfs: use dma_buf_unmap_attachment_unlocked() helper
  usb: uas: reduce time under spinlock
  usb: dwc3: eic7700: Add EIC7700 USB driver
  ...

19 files changed:
1  2 
MAINTAINERS
drivers/thunderbolt/nhi.c
drivers/usb/chipidea/core.c
drivers/usb/dwc3/core.c
drivers/usb/dwc3/dwc3-imx8mp.c
drivers/usb/dwc3/dwc3-pci.c
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/function/f_fs.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/renesas_usbhs/common.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/option.c
drivers/usb/storage/uas.c
drivers/usb/typec/ucsi/psy.c
rust/bindings/bindings_helper.h
rust/helpers/helpers.c
rust/kernel/lib.rs
samples/rust/Kconfig

diff --cc MAINTAINERS
index c7eb037dfac59723e532e723e3868e0c157f477d,9d8aa101f6890e02beaac3e85bd0ea04fb84e7b7..587f5fea8d6e3a982ff883b895a8e58e9e208901
@@@ -2477,8 -2441,8 +2477,9 @@@ F:      Documentation/devicetree/bindings/po
  F:    Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
  F:    Documentation/devicetree/bindings/spi/apple,spi.yaml
  F:    Documentation/devicetree/bindings/spmi/apple,spmi.yaml
+ F:    Documentation/devicetree/bindings/usb/apple,dwc3.yaml
  F:    Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
 +F:    Documentation/hwmon/macsmc-hwmon.rst
  F:    arch/arm64/boot/dts/apple/
  F:    drivers/bluetooth/hci_bcm4377.c
  F:    drivers/clk/clk-apple-nco.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index dc2fec9168b73a4306bfa6a3ab769df1d535f425,8df68261a320fde72f2ba625b81fb77aa20289ab..cf4a0367d6d60ef2c26f8a2e309bc911530389b1
@@@ -818,15 -825,23 +818,30 @@@ static void usbhs_remove(struct platfor
        usbhs_mod_remove(priv);
        usbhs_fifo_remove(priv);
        usbhs_pipe_remove(priv);
 +
 +      /* power off */
 +      if (!usbhs_get_dparam(priv, runtime_pwctrl))
 +              usbhsc_power_ctrl(priv, 0);
 +
 +      usbhsc_clk_put(priv);
 +      pm_runtime_disable(&pdev->dev);
  }
  
+ static void usbhsc_restore(struct device *dev)
+ {
+       struct usbhs_priv *priv = dev_get_drvdata(dev);
+       struct platform_device *pdev = usbhs_priv_to_pdev(priv);
+       if (!usbhs_get_dparam(priv, runtime_pwctrl)) {
+               usbhsc_power_ctrl(priv, 1);
+               usbhs_mod_autonomy_mode(priv);
+       }
+       usbhs_platform_call(priv, phy_reset, pdev);
+       usbhsc_schedule_notify_hotplug(pdev);
+ }
  static int usbhsc_suspend(struct device *dev)
  {
        struct usbhs_priv *priv = dev_get_drvdata(dev);
index b37fa31f56943db8058b9d92bb56d64e6b4c490f,be79a8746098c205f2e52b6ccba94c2f50b43936..fe2f21d85737e1db2067600c17118aaa3c6e5879
@@@ -1074,12 -1050,9 +1050,10 @@@ static const struct usb_device_id id_ta
        /* U-Blox devices */
        { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },
        { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },
 +      { USB_DEVICE_INTERFACE_NUMBER(UBLOX_VID, UBLOX_EVK_M101_PID, 2) },
        /* FreeCalypso USB adapters */
-       { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID),
-               .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
-       { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID),
-               .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+       { USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID, 1) },
+       { USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID, 1) },
        /* GMC devices */
        { USB_DEVICE(GMC_VID, GMC_Z216C_PID) },
        /* Altera USB Blaster 3 */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge