From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Oct 2020 16:51:18 +0000 (-0700)
Subject: Merge tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: v5.10-rc1~125
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c6dbef7307629cce855aa6b482b60cbf7777ed88

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

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

  Lots of tiny different things for these subsystems are in here,
  including:

   - phy driver updates

   - thunderbolt / USB 4 updates and additions

   - USB gadget driver updates

   - xhci fixes and updates

   - typec driver additions and updates

   - api conversions to various drivers for core kernel api changes

   - new USB control message functions to make it harder to get wrong,
     as found by syzbot (took 2 tries to get it right)

   - lots of tiny USB driver fixes and updates all over the place

  All of these have been in linux-next for a while, with the exception
  of the last "obviously correct" patch that updated a FALLTHROUGH
  comment that got merged last weekend"

* tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (374 commits)
  usb: musb: gadget: Use fallthrough pseudo-keyword
  usb: typec: Add QCOM PMIC typec detection driver
  USB: serial: option: add Cellient MPL200 card
  usb: typec: tcpci_maxim: Add support for Sink FRS
  usb: typec: tcpci: Implement callbacks for FRS
  usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)
  usb: typec: tcpci_maxim: Chip level TCPC driver
  usb: typec: tcpci: Add set_vbus tcpci callback
  usb: typec: tcpci: Add a getter method to retrieve tcpm_port reference
  usbip: vhci_hcd: fix calling usb_hcd_giveback_urb() with irqs enabled
  usb: cdc-acm: add quirk to blacklist ETAS ES58X devices
  USB: serial: ftdi_sio: use cur_altsetting for consistency
  USB: serial: option: Add Telit FT980-KS composition
  USB: core: remove polling for /sys/kernel/debug/usb/devices
  usb: typec: add support for STUSB160x Type-C controller family
  usb: typec: add typec_find_pwr_opmode
  usb: typec: hd3ss3220: Use OF graph API to get the connector fwnode
  dt-bindings: usb: renesas,usb3-peri: Document HS and SS data bus
  dt-bindings: usb: convert ti,hd3ss3220 bindings to json-schema
  usb: dwc2: Fix INTR OUT transfers in DDMA mode.
  ...
---

c6dbef7307629cce855aa6b482b60cbf7777ed88
diff --cc drivers/staging/media/Kconfig
index 0f9d159a1477,63d3bc61b529..747c6cf1d795
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@@ -44,8 -42,10 +44,6 @@@ source "drivers/staging/media/tegra-vid
  
  source "drivers/staging/media/ipu3/Kconfig"
  
- source "drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig"
- 
  source "drivers/staging/media/rkisp1/Kconfig"
  
 -if MEDIA_ANALOG_TV_SUPPORT
 -source "drivers/staging/media/usbvision/Kconfig"
 -endif
 -
  endif
diff --cc drivers/staging/media/Makefile
index 965a8b0e6cf2,fee9c9b2aaaf..b59571826ba6
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@@ -10,6 -10,5 +10,5 @@@ obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-vide
  obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/
  obj-$(CONFIG_VIDEO_HANTRO)	+= hantro/
  obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/
- obj-$(CONFIG_PHY_ROCKCHIP_DPHY_RX0)	+= phy-rockchip-dphy-rx0/
  obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1)	+= rkisp1/
 -obj-$(CONFIG_VIDEO_USBVISION)	+= usbvision/
 +obj-$(CONFIG_VIDEO_ZORAN)	+= zoran/