Commit 72bffe7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-6.3-rc1' of git://git.kernel.org/pub/scm/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
  ...
parents ab7362d0 1243741f

Documentation/ABI/testing/configfs-usb-gadget

+13 −0
Original line number Diff line number Diff line
@@ -143,3 +143,16 @@ Description: 
		qw_sign		an identifier to be reported as "OS String"

				proper

		=============	===============================================



What:		/config/usb-gadget/gadget/webusb

Date:		Dec 2022

KernelVersion:	6.3

Description:

		This group contains "WebUSB" extension handling attributes.



		=============	===============================================

		use		flag turning "WebUSB" support on/off

		bcdVersion	bcd WebUSB specification version number

		bVendorCode	one-byte value used for custom per-device

		landingPage	UTF-8 encoded URL of the device's landing page

		=============	===============================================

Documentation/ABI/testing/configfs-usb-gadget-uvc

+52 −5
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Control descriptors



		All attributes read only:

		All attributes read only except enable_interrupt_ep:



		================	=============================

		===================	=============================

		bInterfaceNumber	USB interface number for this

					streaming interface

		================	=============================

		enable_interrupt_ep	flag to enable the interrupt

					endpoint for the VC interface

		===================	=============================



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class

Date:		Dec 2014
@@ -52,7 +54,7 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Default output terminal descriptors



		All attributes read only:

		All attributes read only except bSourceID:



		==============	=============================================

		iTerminal	index of string descriptor
@@ -111,6 +113,34 @@ Description: Default processing unit descriptors 
		bUnitID		a non-zero id of this unit

		===============	========================================



What:		/config/usb-gadget/gadget/functions/uvc.name/control/extensions

Date:		Nov 2022

KernelVersion:	6.1

Description:	Extension unit descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/extensions/name

Date:		Nov 2022

KernelVersion:	6.1

Description:	Extension Unit (XU) Descriptor



		bLength, bUnitID and iExtension are read-only. All others are

		read-write.



		=================	========================================

		bLength			size of the descriptor in bytes

		bUnitID			non-zero ID of this unit

		guidExtensionCode	Vendor-specific code identifying the XU

		bNumControls		number of controls in this XU

		bNrInPins		number of input pins for this unit

		baSourceID		list of the IDs of the units or terminals

					to which this XU is connected

		bControlSize		size of the bmControls field in bytes

		bmControls		list of bitmaps detailing which vendor

					specific controls are supported

		iExtension		index of a string descriptor that describes

					this extension unit

		=================	========================================



What:		/config/usb-gadget/gadget/functions/uvc.name/control/header

Date:		Dec 2014

KernelVersion:	4.0
@@ -165,7 +195,24 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Default color matching descriptors



		All attributes read only:

		All attributes read/write:



		========================  ======================================

		bMatrixCoefficients	  matrix used to compute luma and

					  chroma values from the color primaries

		bTransferCharacteristics  optoelectronic transfer

					  characteristic of the source picture,

					  also called the gamma function

		bColorPrimaries		  color primaries and the reference

					  white

		========================  ======================================



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/name

Date:		Dec 2022

KernelVersion:	6.3

Description:	Additional color matching descriptors



		All attributes read/write:



		========================  ======================================

		bMatrixCoefficients	  matrix used to compute luma and

Documentation/ABI/testing/sysfs-class-usb_power_delivery

+10 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ Description: 
		This file contains boolean value that tells does the device

		support both source and sink power roles.



What:		/sys/class/usb_power_delivery/.../<capability>/1:fixed_supply/usb_suspend_supported

What:		/sys/class/usb_power_delivery/.../source-capabilities/1:fixed_supply/usb_suspend_supported

Date:		May 2022

Contact:	Heikki Krogerus <heikki.krogerus@linux.intel.com>

Description:
@@ -78,6 +78,15 @@ Description: 
		will follow the USB 2.0 and USB 3.2 rules for suspend and

		resume.



What:		/sys/class/usb_power_delivery/.../sink-capabilities/1:fixed_supply/higher_capability

Date:		February 2023

Contact:	Saranya Gopal <saranya.gopal@linux.intel.com>

Description:

		This file shows the value of the Higher capability bit in

		vsafe5V Fixed Supply Object. If the bit is set, then the sink

		needs more than vsafe5V(eg. 12 V) to provide full functionality.

		Valid values: 0, 1



What:		/sys/class/usb_power_delivery/.../<capability>/1:fixed_supply/unconstrained_power

Date:		May 2022

Contact:	Heikki Krogerus <heikki.krogerus@linux.intel.com>

Documentation/ABI/testing/sysfs-driver-typec-displayport

+15 −0
Original line number Diff line number Diff line
@@ -47,3 +47,18 @@ Description: 
		USB SuperSpeed protocol. From user perspective pin assignments C

		and E are equal, where all channels on the connector are used

		for carrying DisplayPort protocol (allowing higher resolutions).



What:		/sys/bus/typec/devices/.../displayport/hpd

Date:		Dec 2022

Contact:	Badhri Jagan Sridharan <badhri@google.com>

Description:

		VESA DisplayPort Alt Mode on USB Type-C Standard defines how

		HotPlugDetect(HPD) shall be supported on the USB-C connector when

		operating in DisplayPort Alt Mode. This is a read only node which

		reflects the current state of HPD.



		Valid values:

			- 1: when HPD’s logical state is high (HPD_High) as defined

			     by VESA DisplayPort Alt Mode on USB Type-C Standard.

			- 0 when HPD’s logical state is low (HPD_Low) as defined by

			     VESA DisplayPort Alt Mode on USB Type-C Standard.

Documentation/devicetree/bindings/mfd/omap-usb-host.txt

+4 −4
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ Required properties if child node exists: 
Properties for children:



The OMAP HS USB Host subsystem contains EHCI and OHCI controllers.

See Documentation/devicetree/bindings/usb/ehci-omap.txt and

Documentation/devicetree/bindings/usb/ohci-omap3.txt.

See Documentation/devicetree/bindings/usb/generic-ehci.yaml and

Documentation/devicetree/bindings/usb/generic-ohci.yaml.



Example for OMAP4:
@@ -78,14 +78,14 @@ usbhshost: usbhshost@4a064000 { 
	ranges;



	usbhsohci: ohci@4a064800 {

		compatible = "ti,ohci-omap3", "usb-ohci";

		compatible = "ti,ohci-omap3";

		reg = <0x4a064800 0x400>;

		interrupt-parent = <&gic>;

		interrupts = <0 76 0x4>;

	};



	usbhsehci: ehci@4a064c00 {

		compatible = "ti,ehci-omap", "usb-ehci";

		compatible = "ti,ehci-omap";

		reg = <0x4a064c00 0x400>;

		interrupt-parent = <&gic>;

		interrupts = <0 77 0x4>;