Skip to content

Commit 72bffe7

Browse files
committed
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 ...
2 parents ab7362d + 1243741 commit 72bffe7

199 files changed

Lines changed: 11871 additions & 2232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/ABI/testing/configfs-usb-gadget

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,16 @@ Description:
143143
qw_sign an identifier to be reported as "OS String"
144144
proper
145145
============= ===============================================
146+
147+
What: /config/usb-gadget/gadget/webusb
148+
Date: Dec 2022
149+
KernelVersion: 6.3
150+
Description:
151+
This group contains "WebUSB" extension handling attributes.
152+
153+
============= ===============================================
154+
use flag turning "WebUSB" support on/off
155+
bcdVersion bcd WebUSB specification version number
156+
bVendorCode one-byte value used for custom per-device
157+
landingPage UTF-8 encoded URL of the device's landing page
158+
============= ===============================================

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

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ Date: Dec 2014
1515
KernelVersion: 4.0
1616
Description: Control descriptors
1717

18-
All attributes read only:
18+
All attributes read only except enable_interrupt_ep:
1919

20-
================ =============================
20+
=================== =============================
2121
bInterfaceNumber USB interface number for this
2222
streaming interface
23-
================ =============================
23+
enable_interrupt_ep flag to enable the interrupt
24+
endpoint for the VC interface
25+
=================== =============================
2426

2527
What: /config/usb-gadget/gadget/functions/uvc.name/control/class
2628
Date: Dec 2014
@@ -52,7 +54,7 @@ Date: Dec 2014
5254
KernelVersion: 4.0
5355
Description: Default output terminal descriptors
5456

55-
All attributes read only:
57+
All attributes read only except bSourceID:
5658

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

116+
What: /config/usb-gadget/gadget/functions/uvc.name/control/extensions
117+
Date: Nov 2022
118+
KernelVersion: 6.1
119+
Description: Extension unit descriptors
120+
121+
What: /config/usb-gadget/gadget/functions/uvc.name/control/extensions/name
122+
Date: Nov 2022
123+
KernelVersion: 6.1
124+
Description: Extension Unit (XU) Descriptor
125+
126+
bLength, bUnitID and iExtension are read-only. All others are
127+
read-write.
128+
129+
================= ========================================
130+
bLength size of the descriptor in bytes
131+
bUnitID non-zero ID of this unit
132+
guidExtensionCode Vendor-specific code identifying the XU
133+
bNumControls number of controls in this XU
134+
bNrInPins number of input pins for this unit
135+
baSourceID list of the IDs of the units or terminals
136+
to which this XU is connected
137+
bControlSize size of the bmControls field in bytes
138+
bmControls list of bitmaps detailing which vendor
139+
specific controls are supported
140+
iExtension index of a string descriptor that describes
141+
this extension unit
142+
================= ========================================
143+
114144
What: /config/usb-gadget/gadget/functions/uvc.name/control/header
115145
Date: Dec 2014
116146
KernelVersion: 4.0
@@ -165,7 +195,24 @@ Date: Dec 2014
165195
KernelVersion: 4.0
166196
Description: Default color matching descriptors
167197

168-
All attributes read only:
198+
All attributes read/write:
199+
200+
======================== ======================================
201+
bMatrixCoefficients matrix used to compute luma and
202+
chroma values from the color primaries
203+
bTransferCharacteristics optoelectronic transfer
204+
characteristic of the source picture,
205+
also called the gamma function
206+
bColorPrimaries color primaries and the reference
207+
white
208+
======================== ======================================
209+
210+
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/name
211+
Date: Dec 2022
212+
KernelVersion: 6.3
213+
Description: Additional color matching descriptors
214+
215+
All attributes read/write:
169216

170217
======================== ======================================
171218
bMatrixCoefficients matrix used to compute luma and

Documentation/ABI/testing/sysfs-class-usb_power_delivery

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Description:
6969
This file contains boolean value that tells does the device
7070
support both source and sink power roles.
7171

72-
What: /sys/class/usb_power_delivery/.../<capability>/1:fixed_supply/usb_suspend_supported
72+
What: /sys/class/usb_power_delivery/.../source-capabilities/1:fixed_supply/usb_suspend_supported
7373
Date: May 2022
7474
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
7575
Description:
@@ -78,6 +78,15 @@ Description:
7878
will follow the USB 2.0 and USB 3.2 rules for suspend and
7979
resume.
8080

81+
What: /sys/class/usb_power_delivery/.../sink-capabilities/1:fixed_supply/higher_capability
82+
Date: February 2023
83+
Contact: Saranya Gopal <saranya.gopal@linux.intel.com>
84+
Description:
85+
This file shows the value of the Higher capability bit in
86+
vsafe5V Fixed Supply Object. If the bit is set, then the sink
87+
needs more than vsafe5V(eg. 12 V) to provide full functionality.
88+
Valid values: 0, 1
89+
8190
What: /sys/class/usb_power_delivery/.../<capability>/1:fixed_supply/unconstrained_power
8291
Date: May 2022
8392
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,18 @@ Description:
4747
USB SuperSpeed protocol. From user perspective pin assignments C
4848
and E are equal, where all channels on the connector are used
4949
for carrying DisplayPort protocol (allowing higher resolutions).
50+
51+
What: /sys/bus/typec/devices/.../displayport/hpd
52+
Date: Dec 2022
53+
Contact: Badhri Jagan Sridharan <badhri@google.com>
54+
Description:
55+
VESA DisplayPort Alt Mode on USB Type-C Standard defines how
56+
HotPlugDetect(HPD) shall be supported on the USB-C connector when
57+
operating in DisplayPort Alt Mode. This is a read only node which
58+
reflects the current state of HPD.
59+
60+
Valid values:
61+
- 1: when HPD’s logical state is high (HPD_High) as defined
62+
by VESA DisplayPort Alt Mode on USB Type-C Standard.
63+
- 0 when HPD’s logical state is low (HPD_Low) as defined by
64+
VESA DisplayPort Alt Mode on USB Type-C Standard.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Required properties if child node exists:
6464
Properties for children:
6565

6666
The OMAP HS USB Host subsystem contains EHCI and OHCI controllers.
67-
See Documentation/devicetree/bindings/usb/ehci-omap.txt and
68-
Documentation/devicetree/bindings/usb/ohci-omap3.txt.
67+
See Documentation/devicetree/bindings/usb/generic-ehci.yaml and
68+
Documentation/devicetree/bindings/usb/generic-ohci.yaml.
6969

7070
Example for OMAP4:
7171

@@ -78,14 +78,14 @@ usbhshost: usbhshost@4a064000 {
7878
ranges;
7979

8080
usbhsohci: ohci@4a064800 {
81-
compatible = "ti,ohci-omap3", "usb-ohci";
81+
compatible = "ti,ohci-omap3";
8282
reg = <0x4a064800 0x400>;
8383
interrupt-parent = <&gic>;
8484
interrupts = <0 76 0x4>;
8585
};
8686

8787
usbhsehci: ehci@4a064c00 {
88-
compatible = "ti,ehci-omap", "usb-ehci";
88+
compatible = "ti,ehci-omap";
8989
reg = <0x4a064c00 0x400>;
9090
interrupt-parent = <&gic>;
9191
interrupts = <0 77 0x4>;

Documentation/devicetree/bindings/powerpc/nintendo/wii.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,6 @@ Nintendo Wii device tree
9797
- reg : should contain the EXI registers location and length
9898
- interrupts : should contain the EXI interrupt
9999

100-
1.g) The Open Host Controller Interface (OHCI) nodes
101-
102-
Represent the USB 1.x Open Host Controller Interfaces.
103-
104-
Required properties:
105-
106-
- compatible : should be "nintendo,hollywood-usb-ohci","usb-ohci"
107-
- reg : should contain the OHCI registers location and length
108-
- interrupts : should contain the OHCI interrupt
109-
110100
1.h) The Enhanced Host Controller Interface (EHCI) node
111101

112102
Represents the USB 2.0 Enhanced Host Controller Interface.

Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ maintainers:
1313
properties:
1414
compatible:
1515
oneOf:
16-
- const: allwinner,sun4i-a10-musb
17-
- const: allwinner,sun6i-a31-musb
18-
- const: allwinner,sun8i-a33-musb
19-
- const: allwinner,sun8i-h3-musb
16+
- enum:
17+
- allwinner,sun4i-a10-musb
18+
- allwinner,sun6i-a31-musb
19+
- allwinner,sun8i-a33-musb
20+
- allwinner,sun8i-h3-musb
21+
- allwinner,suniv-f1c100s-musb
2022
- items:
2123
- enum:
2224
- allwinner,sun8i-a83t-musb

Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ allOf:
108108
then:
109109
properties:
110110
phy-names:
111+
minItems: 2
111112
items:
112113
- const: usb2-phy0 # USB2 PHY0 if USBHOST_A port is used
113114
- const: usb2-phy1 # USB2 PHY1 if USBOTG_B port is used

Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Required properties:
1111
"fsl,imx6ul-usb"
1212
"fsl,imx7d-usb"
1313
"fsl,imx7ulp-usb"
14+
"fsl,imx8mm-usb"
1415
"lsi,zevio-usb"
1516
"qcom,ci-hdrc"
1617
"chipidea,usb2"

0 commit comments

Comments
 (0)