Skip to content

Commit 04d1733

Browse files
committed
Merge tag 'usb-6.11-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 changes for 6.11-rc1. Nothing earth-shattering in here, just constant forward progress in adding support for new hardware and better debugging functionalities for thunderbolt devices and the subsystem. Included in here are: - thunderbolt debugging update and driver additions - xhci driver updates - typec driver updates - kselftest device driver changes (acked by the relevant maintainers, depended on other changes in this tree.) - cdns3 driver updates - gadget driver updates - MODULE_DESCRIPTION() additions - dwc3 driver updates and fixes All of these have been in linux-next for a while with no reported issues" * tag 'usb-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (112 commits) kselftest: devices: Add test to detect device error logs kselftest: Move ksft helper module to common directory kselftest: devices: Move discoverable devices test to subdirectory usb: gadget: f_uac2: fix non-newline-terminated function name USB: uas: Implement the new shutdown callback USB: core: add 'shutdown' callback to usb_driver usb: typec: Drop explicit initialization of struct i2c_device_id::driver_data to 0 usb: dwc3: enable CCI support for AMD-xilinx DWC3 controller usb: dwc2: add support for other Lantiq SoCs usb: gadget: Use u16 types for 16-bit fields usb: gadget: midi2: Fix incorrect default MIDI2 protocol setup usb: dwc3: core: Check all ports when set phy suspend usb: typec: tcpci: add support to set connector orientation dt-bindings: usb: Convert fsl-usb to yaml usb: typec: ucsi: reorder operations in ucsi_run_command() usb: typec: ucsi: extract common code for command handling usb: typec: ucsi: inline ucsi_read_message_in usb: typec: ucsi: rework command execution functions usb: typec: ucsi: split read operation usb: typec: ucsi: simplify command sending API ...
2 parents aba9753 + b727493 commit 04d1733

File tree

127 files changed

+2553
-1197
lines changed

Some content is hidden

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

127 files changed

+2553
-1197
lines changed

Documentation/ABI/testing/sysfs-bus-pci-drivers-xhci_hcd

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,13 @@ Description:
7575
The default value is 1 (GNU Remote Debug command).
7676
Other permissible value is 0 which is for vendor defined debug
7777
target.
78+
79+
What: /sys/bus/pci/drivers/xhci_hcd/.../dbc_poll_interval_ms
80+
Date: February 2024
81+
Contact: Mathias Nyman <[email protected]>
82+
Description:
83+
This attribute adjust the polling interval used to check for
84+
DbC events. Unit is milliseconds. Accepted values range from 0
85+
up to 5000. The default value is 64 ms.
86+
This polling interval is used while DbC is enabled but has no
87+
active data transfers.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7041,6 +7041,9 @@
70417041
usb-storage.delay_use=
70427042
[UMS] The delay in seconds before a new device is
70437043
scanned for Logical Units (default 1).
7044+
Optionally the delay in milliseconds if the value has
7045+
suffix with "ms".
7046+
Example: delay_use=2567ms
70447047

70457048
usb-storage.quirks=
70467049
[UMS] A list of quirks entries to supplement or

Documentation/devicetree/bindings/usb/cdns,usb3.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ properties:
4242
- const: otg
4343
- const: wakeup
4444

45-
dr_mode:
46-
enum: [host, otg, peripheral]
45+
port:
46+
$ref: /schemas/graph.yaml#/properties/port
47+
description:
48+
This port is used with the 'usb-role-switch' property to connect the
49+
cdns3 to type C connector.
4750

4851
maximum-speed:
4952
enum: [super-speed, high-speed, full-speed]
@@ -70,14 +73,20 @@ properties:
7073
description: Enable resetting of PHY if Rx fail is detected
7174
type: boolean
7275

76+
dependencies:
77+
port: [ usb-role-switch ]
78+
7379
required:
7480
- compatible
7581
- reg
7682
- reg-names
7783
- interrupts
7884
- interrupt-names
7985

80-
additionalProperties: false
86+
allOf:
87+
- $ref: usb-drd.yaml#
88+
89+
unevaluatedProperties: false
8190

8291
examples:
8392
- |

Documentation/devicetree/bindings/usb/dwc2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ required:
188188
- clocks
189189
- clock-names
190190

191-
additionalProperties: false
191+
unevaluatedProperties: false
192192

193193
examples:
194194
- |
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/fsl,usb2.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale SOC USB controllers
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
description: |
13+
The device node for a USB controller that is part of a Freescale
14+
SOC is as described in the document "Open Firmware Recommended
15+
Practice: Universal Serial Bus" with the following modifications
16+
and additions.
17+
18+
properties:
19+
compatible:
20+
oneOf:
21+
- enum:
22+
- fsl-usb2-mph
23+
- fsl-usb2-dr
24+
- items:
25+
- enum:
26+
- fsl-usb2-dr-v2.2
27+
- fsl-usb2-dr-v2.5
28+
- const: fsl-usb2-dr
29+
30+
reg:
31+
maxItems: 1
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
phy_type:
37+
$ref: /schemas/types.yaml#/definitions/string
38+
enum: [ulpi, serial, utmi, utmi_wide]
39+
40+
port0:
41+
$ref: /schemas/types.yaml#/definitions/flag
42+
description:
43+
Indicates port0 is connected for fsl-usb2-mph compatible controllers.
44+
45+
port1:
46+
$ref: /schemas/types.yaml#/definitions/flag
47+
description:
48+
Indicates port1 is connected for "fsl-usb2-mph" compatible controllers.
49+
50+
fsl,invert-drvvbus:
51+
$ref: /schemas/types.yaml#/definitions/flag
52+
description:
53+
for MPC5121 USB0 only. Indicates the
54+
port power polarity of internal PHY signal DRVVBUS is inverted.
55+
56+
fsl,invert-pwr-fault:
57+
$ref: /schemas/types.yaml#/definitions/flag
58+
description:
59+
for MPC5121 USB0 only. Indicates
60+
the PWR_FAULT signal polarity is inverted.
61+
62+
required:
63+
- compatible
64+
- reg
65+
- interrupts
66+
- phy_type
67+
68+
allOf:
69+
- $ref: usb-drd.yaml#
70+
71+
unevaluatedProperties: false
72+
73+
examples:
74+
- |
75+
#include <dt-bindings/interrupt-controller/irq.h>
76+
77+
usb@22000 {
78+
compatible = "fsl-usb2-mph";
79+
reg = <22000 1000>;
80+
interrupts = <27 IRQ_TYPE_EDGE_RISING>;
81+
phy_type = "ulpi";
82+
port0;
83+
port1;
84+
};
85+
86+
- |
87+
#include <dt-bindings/interrupt-controller/irq.h>
88+
89+
usb@23000 {
90+
compatible = "fsl-usb2-dr";
91+
reg = <23000 1000>;
92+
interrupts = <26 IRQ_TYPE_EDGE_RISING>;
93+
dr_mode = "otg";
94+
phy_type = "ulpi";
95+
};

Documentation/devicetree/bindings/usb/fsl-usb.txt

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

Documentation/devicetree/bindings/usb/genesys,gl850g.yaml

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ title: Genesys Logic USB hub controller
99
maintainers:
1010
- Icenowy Zheng <[email protected]>
1111

12-
allOf:
13-
- $ref: usb-device.yaml#
14-
1512
properties:
1613
compatible:
1714
enum:
@@ -27,17 +24,44 @@ properties:
2724

2825
vdd-supply:
2926
description:
30-
the regulator that provides 3.3V core power to the hub.
27+
The regulator that provides 3.3V or 5.0V core power to the hub.
3128

3229
peer-hub:
3330
$ref: /schemas/types.yaml#/definitions/phandle
3431
description:
35-
phandle to the peer hub on the controller.
32+
For onboard hub controllers that support USB 3.x and USB 2.0 hubs
33+
with shared resets and power supplies, this property is used to identify
34+
the hubs with which these are shared.
3635

3736
required:
3837
- compatible
3938
- reg
4039

40+
allOf:
41+
- $ref: usb-device.yaml#
42+
- if:
43+
properties:
44+
compatible:
45+
contains:
46+
enum:
47+
- usb5e3,608
48+
then:
49+
properties:
50+
peer-hub: false
51+
vdd-supply: false
52+
53+
- if:
54+
properties:
55+
compatible:
56+
contains:
57+
enum:
58+
- usb5e3,610
59+
- usb5e3,620
60+
then:
61+
properties:
62+
peer-hub: true
63+
vdd-supply: true
64+
4165
additionalProperties: false
4266

4367
examples:
@@ -54,3 +78,29 @@ examples:
5478
reset-gpios = <&pio 7 2 GPIO_ACTIVE_LOW>;
5579
};
5680
};
81+
82+
- |
83+
#include <dt-bindings/gpio/gpio.h>
84+
usb {
85+
dr_mode = "host";
86+
#address-cells = <1>;
87+
#size-cells = <0>;
88+
89+
/* 2.0 hub on port 1 */
90+
hub_2_0: hub@1 {
91+
compatible = "usb5e3,610";
92+
reg = <1>;
93+
peer-hub = <&hub_3_0>;
94+
reset-gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
95+
vdd-supply = <&vcc_5v>;
96+
};
97+
98+
/* 3.1 hub on port 4 */
99+
hub_3_0: hub@2 {
100+
compatible = "usb5e3,620";
101+
reg = <2>;
102+
peer-hub = <&hub_2_0>;
103+
reset-gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
104+
vdd-supply = <&vcc_5v>;
105+
};
106+
};

Documentation/devicetree/bindings/usb/gpio-sbu-mux.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- nxp,cbdtu02043
2323
- onnn,fsusb43l10x
2424
- pericom,pi3usb102
25+
- ti,tmuxhs4212
2526
- const: gpio-sbu-mux
2627

2728
enable-gpios:
@@ -44,13 +45,18 @@ properties:
4445

4546
required:
4647
- compatible
47-
- enable-gpios
4848
- select-gpios
4949
- orientation-switch
5050
- port
5151

5252
allOf:
5353
- $ref: usb-switch.yaml#
54+
- if:
55+
required:
56+
- mode-switch
57+
then:
58+
required:
59+
- enable-gpios
5460

5561
additionalProperties: false
5662

Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ properties:
3434
clocks:
3535
maxItems: 1
3636

37+
microchip,ext-vbus-drv:
38+
description:
39+
Some ULPI USB PHYs do not support an internal VBUS supply and driving
40+
the CPEN pin requires the configuration of the UPLI_USE__EXTVBUS
41+
bit in ULPI_BUSCONTROL.
42+
$ref: /schemas/types.yaml#/definitions/flag
43+
3744
required:
3845
- compatible
3946
- reg

0 commit comments

Comments
 (0)