Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

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

  Nothing major in here, lots of little things with new devices
  supported and updates for a few drivers. Highlights include:

   - thunderbolt/USB4 devices supported a bit better than before, and
     some new ids to enable new hardware devices

   - USB gadget uvc updates for newer video formats and better v4l
     integration (the v4l portions were acked by those maintainers)

   - typec updates for tiny issues and more typec drivers for new chips.

   - xhci tiny updates for minor issues

   - big usb-serial ftdi_sio driver update to handle new devices better

   - lots of tiny dwc3 fixes and updates for the IP block that is
     showing up everywhere these days

   - dts updates for new devices being supported

   - other tiny janitorial and cleanups fixes for lots of different USB
     drivers. Full details are in the shortlog.

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

* tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (169 commits)
  usb: gadget: uvc: don't put item still in use
  usb: gadget: uvc: Fix argument to sizeof() in uvc_register_video()
  usb: host: ehci-exynos: switch to using gpiod API
  Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
  Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present""
  dt-bindings: usb: Convert FOTG210 to dt schema
  usb: mtu3: fix failed runtime suspend in host only mode
  USB: omap_udc: Fix spelling mistake: "tranceiver_ctrl" -> "transceiver_ctrl"
  usb: typec: ucsi_ccg: Disable UCSI ALT support on Tegra
  usb: typec: Replace custom implementation of device_match_fwnode()
  usb: typec: ucsi: Don't warn on probe deferral
  usb: add quirks for Lenovo OneLink+ Dock
  MAINTAINERS: switch dwc3 to Thinh
  usb: idmouse: fix an uninit-value in idmouse_open
  USB: PHY: JZ4770: Switch to use dev_err_probe() helper
  usb: phy: generic: Switch to use dev_err_probe() helper
  usb: ulpi: use DEFINE_SHOW_ATTRIBUTE to simplify ulpi_regs
  usb: cdns3: remove dead code
  usb: cdc-wdm: Use skb_put_data() instead of skb_put/memcpy pair
  usb: musb: sunxi: Switch to use dev_err_probe() helper
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/freescale/imx8mp.dtsi
Simple merge

diff --cc drivers/media/usb/uvc/uvc_ctrl.c
Simple merge

diff --cc drivers/media/usb/uvc/uvc_driver.c
Simple merge

diff --cc drivers/phy/tegra/xusb-tegra186.c
Simple merge

diff --cc drivers/phy/tegra/xusb.c
Simple merge

diff --cc drivers/thunderbolt/nhi.c
Simple merge

diff --cc drivers/thunderbolt/switch.c
Simple merge

diff --cc drivers/thunderbolt/tb.c
Simple merge

diff --cc drivers/thunderbolt/tb.h
index 0f067c06cba6a52af5f684d16ef6bdde3ead1a0f,32843e64482fd6e00e2cd69ed850590a3712ab7f..f9786976f5ecfc55bd6c5e53452cba97b9c1c9ca
--- 1/drivers/thunderbolt/tb.h
--- 2/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@@ -1174,9 -1194,10 +1194,10 @@@ int usb4_switch_add_ports(struct tb_swi
  void usb4_switch_remove_ports(struct tb_switch *sw);
  
  int usb4_port_unlock(struct tb_port *port);
+ int usb4_port_hotplug_enable(struct tb_port *port);
  int usb4_port_configure(struct tb_port *port);
  void usb4_port_unconfigure(struct tb_port *port);
 -int usb4_port_configure_xdomain(struct tb_port *port);
 +int usb4_port_configure_xdomain(struct tb_port *port, struct tb_xdomain *xd);
  void usb4_port_unconfigure_xdomain(struct tb_port *port);
  int usb4_port_router_offline(struct tb_port *port);
  int usb4_port_router_online(struct tb_port *port);

diff --cc drivers/thunderbolt/usb4.c
Simple merge

diff --cc drivers/usb/misc/usb3503.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
index 0a1da579ead526a67181d061be04b2cecb35459d,31b9b36f3a1cbadb13016444d4267675ff0221ce..05e28a5ce42b1196db9f592618afdcc350fed059
--- 1/drivers/usb/serial/ftdi_sio.c
--- 2/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@@ -1078,29 -1107,8 +1107,9 @@@ static const char *ftdi_chip_name[] = 
  #define FTDI_STATUS_B1_MASK   (FTDI_RS_BI)
  /* End TIOCMIWAIT */
  
- /* function prototypes for a FTDI serial converter */
- static int  ftdi_sio_probe(struct usb_serial *serial,
-                                       const struct usb_device_id *id);
- static int  ftdi_sio_port_probe(struct usb_serial_port *port);
- static void ftdi_sio_port_remove(struct usb_serial_port *port);
- static int  ftdi_open(struct tty_struct *tty, struct usb_serial_port *port);
- static void ftdi_dtr_rts(struct usb_serial_port *port, int on);
- static void ftdi_process_read_urb(struct urb *urb);
- static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
-                                               void *dest, size_t size);
  static void ftdi_set_termios(struct tty_struct *tty,
 -                      struct usb_serial_port *port, struct ktermios *old);
 +                           struct usb_serial_port *port,
 +                           const struct ktermios *old_termios);
- static int  ftdi_tiocmget(struct tty_struct *tty);
- static int  ftdi_tiocmset(struct tty_struct *tty,
-                       unsigned int set, unsigned int clear);
- static int  ftdi_ioctl(struct tty_struct *tty,
-                       unsigned int cmd, unsigned long arg);
- static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss);
- static int set_serial_info(struct tty_struct *tty,
-                               struct serial_struct *ss);
- static void ftdi_break_ctl(struct tty_struct *tty, int break_state);
- static bool ftdi_tx_empty(struct usb_serial_port *port);
  static int ftdi_get_modem_status(struct usb_serial_port *port,
                                                unsigned char status[2]);
  

diff --cc drivers/usb/typec/anx7411.c
Simple merge

diff --cc drivers/usb/typec/stusb160x.c
Simple merge

diff --cc drivers/usb/typec/tcpm/fusb302.c
Simple merge

diff --cc drivers/usb/typec/tcpm/tcpci.c
Simple merge

diff --cc drivers/usb/typec/tcpm/tcpci_rt1711h.c
Simple merge

diff --cc drivers/usb/typec/ucsi/ucsi.c
Simple merge

diff --cc drivers/usb/typec/ucsi/ucsi_ccg.c
Simple merge

diff --cc drivers/usb/typec/ucsi/ucsi_stm32g0.c
Simple merge