Skip to content

Commit a1b5bd4

Browse files
committed
Merge tag 'usb-6.15-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 updates for 6.15-rc1. Included in here are: - Thunderbolt driver and core api updates for new hardware and features - usb-storage const array cleanups - typec driver updates - dwc3 driver updates - xhci driver updates and bugfixes - small USB documentation updates - usb cdns3 driver updates - usb gadget driver updates - other small driver updates and fixes All of these have been in linux-next for a while with no reported issues" * tag 'usb-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (92 commits) thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer thunderbolt: Scan retimers after device router has been enumerated usb: host: cdns3: forward lost power information to xhci usb: host: xhci-plat: allow upper layers to signal power loss usb: xhci: change xhci_resume() parameters to explicit the desired info usb: cdns3-ti: run HW init at resume() if HW was reset usb: cdns3-ti: move reg writes to separate function usb: cdns3: call cdns_power_is_lost() only once in cdns_resume() usb: cdns3: rename hibernated argument of role->resume() to lost_power usb: xhci: tegra: rename `runtime` boolean to `is_auto_runtime` usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func usb: dwc3: Don't use %pK through printk usb: core: Don't use %pK through printk usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() dt-bindings: usb: qcom,dwc3: Synchronize minItems for interrupts and -names usb: common: usb-conn-gpio: switch psy_cfg from of_node to fwnode usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running usb: xhci: Don't change the status of stalled TDs on failed Stop EP xhci: Avoid queuing redundant Stop Endpoint command for stalled endpoint xhci: Handle spurious events on Etron host isoc enpoints ...
2 parents ddd0172 + ed492c9 commit a1b5bd4

Some content is hidden

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

87 files changed

+1637
-699
lines changed

Documentation/devicetree/bindings/mfd/aspeed-lpc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2-
# # Copyright (c) 2021 Aspeed Tehchnology Inc.
2+
# # Copyright (c) 2021 Aspeed Technology Inc.
33
%YAML 1.2
44
---
55
$id: http://devicetree.org/schemas/mfd/aspeed-lpc.yaml#

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ properties:
5151
- const: core
5252
- const: reg
5353

54+
dma-coherent: true
55+
5456
power-domains:
5557
maxItems: 1
5658

Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@ title: Microchip USB2514 Hub Controller
99
maintainers:
1010
- Fabio Estevam <festevam@gmail.com>
1111

12-
allOf:
13-
- $ref: usb-device.yaml#
14-
1512
properties:
1613
compatible:
17-
enum:
18-
- usb424,2412
19-
- usb424,2417
20-
- usb424,2514
21-
- usb424,2517
14+
oneOf:
15+
- enum:
16+
- usb424,2412
17+
- usb424,2417
18+
- usb424,2514
19+
- usb424,2517
20+
- items:
21+
- enum:
22+
- usb424,2512
23+
- usb424,2513
24+
- const: usb424,2514
2225

2326
reg: true
2427

@@ -28,6 +31,9 @@ properties:
2831
vdd-supply:
2932
description: 3.3V power supply.
3033

34+
vdda-supply:
35+
description: 3.3V analog power supply.
36+
3137
clocks:
3238
description: External 24MHz clock connected to the CLKIN pin.
3339
maxItems: 1
@@ -43,6 +49,18 @@ patternProperties:
4349
$ref: /schemas/usb/usb-device.yaml
4450
additionalProperties: true
4551

52+
allOf:
53+
- $ref: usb-device.yaml#
54+
- if:
55+
not:
56+
properties:
57+
compatible:
58+
contains:
59+
const: usb424,2514
60+
then:
61+
properties:
62+
vdda-supply: false
63+
4664
unevaluatedProperties: false
4765

4866
examples:
@@ -60,6 +78,7 @@ examples:
6078
clocks = <&clks IMX6QDL_CLK_CKO>;
6179
reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
6280
vdd-supply = <&reg_3v3_hub>;
81+
vdda-supply = <&reg_3v3a_hub>;
6382
#address-cells = <1>;
6483
#size-cells = <0>;
6584
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/parade,ps8830.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Parade PS883x USB and DisplayPort Retimer
8+
9+
maintainers:
10+
- Abel Vesa <abel.vesa@linaro.org>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- parade,ps8830
16+
17+
reg:
18+
maxItems: 1
19+
20+
clocks:
21+
items:
22+
- description: XO Clock
23+
24+
reset-gpios:
25+
maxItems: 1
26+
27+
vdd-supply:
28+
description: power supply (1.07V)
29+
30+
vdd33-supply:
31+
description: power supply (3.3V)
32+
33+
vdd33-cap-supply:
34+
description: power supply (3.3V)
35+
36+
vddar-supply:
37+
description: power supply (1.07V)
38+
39+
vddat-supply:
40+
description: power supply (1.07V)
41+
42+
vddio-supply:
43+
description: power supply (1.2V or 1.8V)
44+
45+
orientation-switch: true
46+
retimer-switch: true
47+
48+
ports:
49+
$ref: /schemas/graph.yaml#/properties/ports
50+
properties:
51+
port@0:
52+
$ref: /schemas/graph.yaml#/properties/port
53+
description: Super Speed (SS) Output endpoint to the Type-C connector
54+
55+
port@1:
56+
$ref: /schemas/graph.yaml#/$defs/port-base
57+
description: Super Speed (SS) Input endpoint from the Super-Speed PHY
58+
unevaluatedProperties: false
59+
60+
port@2:
61+
$ref: /schemas/graph.yaml#/properties/port
62+
description:
63+
Sideband Use (SBU) AUX lines endpoint to the Type-C connector for the purpose of
64+
handling altmode muxing and orientation switching.
65+
66+
required:
67+
- compatible
68+
- reg
69+
- clocks
70+
- reset-gpios
71+
- vdd-supply
72+
- vdd33-supply
73+
- vdd33-cap-supply
74+
- vddat-supply
75+
- vddio-supply
76+
- orientation-switch
77+
- retimer-switch
78+
79+
allOf:
80+
- $ref: usb-switch.yaml#
81+
82+
additionalProperties: false
83+
84+
examples:
85+
- |
86+
#include <dt-bindings/gpio/gpio.h>
87+
88+
i2c {
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
92+
typec-mux@8 {
93+
compatible = "parade,ps8830";
94+
reg = <0x8>;
95+
96+
clocks = <&clk_rtmr_xo>;
97+
98+
vdd-supply = <&vreg_rtmr_1p15>;
99+
vdd33-supply = <&vreg_rtmr_3p3>;
100+
vdd33-cap-supply = <&vreg_rtmr_3p3>;
101+
vddar-supply = <&vreg_rtmr_1p15>;
102+
vddat-supply = <&vreg_rtmr_1p15>;
103+
vddio-supply = <&vreg_rtmr_1p8>;
104+
105+
reset-gpios = <&tlmm 10 GPIO_ACTIVE_LOW>;
106+
107+
retimer-switch;
108+
orientation-switch;
109+
110+
ports {
111+
#address-cells = <1>;
112+
#size-cells = <0>;
113+
114+
port@0 {
115+
reg = <0>;
116+
117+
endpoint {
118+
remote-endpoint = <&typec_con_ss>;
119+
};
120+
};
121+
122+
port@1 {
123+
reg = <1>;
124+
125+
endpoint {
126+
remote-endpoint = <&usb_phy_ss>;
127+
};
128+
};
129+
130+
port@2 {
131+
reg = <2>;
132+
133+
endpoint {
134+
remote-endpoint = <&typec_dp_aux>;
135+
};
136+
};
137+
};
138+
};
139+
};
140+
...

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ allOf:
404404
minItems: 2
405405
maxItems: 3
406406
interrupt-names:
407+
minItems: 2
407408
items:
408409
- const: pwr_event
409410
- const: qusb2_phy
@@ -425,6 +426,7 @@ allOf:
425426
minItems: 3
426427
maxItems: 4
427428
interrupt-names:
429+
minItems: 3
428430
items:
429431
- const: pwr_event
430432
- const: qusb2_phy

Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ properties:
3030
interrupts:
3131
maxItems: 1
3232

33+
vbus-supply:
34+
description: VBUS power supply
35+
3336
wakeup-source:
3437
type: boolean
3538

Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ select:
2626
contains:
2727
enum:
2828
- rockchip,rk3328-dwc3
29+
- rockchip,rk3562-dwc3
2930
- rockchip,rk3568-dwc3
3031
- rockchip,rk3576-dwc3
3132
- rockchip,rk3588-dwc3
@@ -37,6 +38,7 @@ properties:
3738
items:
3839
- enum:
3940
- rockchip,rk3328-dwc3
41+
- rockchip,rk3562-dwc3
4042
- rockchip,rk3568-dwc3
4143
- rockchip,rk3576-dwc3
4244
- rockchip,rk3588-dwc3
@@ -72,6 +74,7 @@ properties:
7274
- enum:
7375
- grf_clk
7476
- utmi
77+
- pipe
7578
- const: pipe
7679

7780
power-domains:
@@ -111,6 +114,22 @@ allOf:
111114
- const: suspend_clk
112115
- const: bus_clk
113116
- const: grf_clk
117+
- if:
118+
properties:
119+
compatible:
120+
contains:
121+
const: rockchip,rk3562-dwc3
122+
then:
123+
properties:
124+
clocks:
125+
minItems: 4
126+
maxItems: 4
127+
clock-names:
128+
items:
129+
- const: ref_clk
130+
- const: suspend_clk
131+
- const: bus_clk
132+
- const: pipe
114133
- if:
115134
properties:
116135
compatible:

Documentation/devicetree/bindings/usb/samsung,exynos-dwc3.yaml

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
enum:
15-
- google,gs101-dwusb3
16-
- samsung,exynos5250-dwusb3
17-
- samsung,exynos5433-dwusb3
18-
- samsung,exynos7-dwusb3
19-
- samsung,exynos850-dwusb3
14+
oneOf:
15+
- enum:
16+
- google,gs101-dwusb3
17+
- samsung,exynos5250-dwusb3
18+
- samsung,exynos5433-dwusb3
19+
- samsung,exynos7-dwusb3
20+
- samsung,exynos7870-dwusb3
21+
- samsung,exynos850-dwusb3
22+
- items:
23+
- const: samsung,exynos990-dwusb3
24+
- const: samsung,exynos850-dwusb3
2025

2126
'#address-cells':
2227
const: 1
@@ -52,7 +57,6 @@ required:
5257
- clock-names
5358
- ranges
5459
- '#size-cells'
55-
- vdd10-supply
5660
- vdd33-supply
5761

5862
allOf:
@@ -72,6 +76,8 @@ allOf:
7276
- const: susp_clk
7377
- const: link_aclk
7478
- const: link_pclk
79+
required:
80+
- vdd10-supply
7581

7682
- if:
7783
properties:
@@ -86,6 +92,8 @@ allOf:
8692
clock-names:
8793
items:
8894
- const: usbdrd30
95+
required:
96+
- vdd10-supply
8997

9098
- if:
9199
properties:
@@ -103,6 +111,8 @@ allOf:
103111
- const: susp_clk
104112
- const: phyclk
105113
- const: pipe_pclk
114+
required:
115+
- vdd10-supply
106116

107117
- if:
108118
properties:
@@ -119,6 +129,24 @@ allOf:
119129
- const: usbdrd30
120130
- const: usbdrd30_susp_clk
121131
- const: usbdrd30_axius_clk
132+
required:
133+
- vdd10-supply
134+
135+
- if:
136+
properties:
137+
compatible:
138+
contains:
139+
const: samsung,exynos7870-dwusb3
140+
then:
141+
properties:
142+
clocks:
143+
minItems: 3
144+
maxItems: 3
145+
clock-names:
146+
items:
147+
- const: bus_early
148+
- const: ref
149+
- const: ctrl
122150

123151
- if:
124152
properties:
@@ -134,6 +162,8 @@ allOf:
134162
items:
135163
- const: bus_early
136164
- const: ref
165+
required:
166+
- vdd10-supply
137167

138168
additionalProperties: false
139169

0 commit comments

Comments
 (0)