Skip to content

Commit 07281a2

Browse files
committed
Merge tag 'usb-5.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 patches for 5.15-rc1. Nothing huge in here, just lots of constant forward progress on a number of different drivers and hardware support: - more USB 4/Thunderbolt support added - dwc3 driver updates and additions - usb gadget fixes and addtions for new types - udc gadget driver updates - host controller updates - removal of obsolete drivers - other minor driver updates All of these have been in linux-next for a while with no reported issues" * tag 'usb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (148 commits) usb: isp1760: otg control register access usb: isp1760: use the right irq status bit usb: isp1760: write to status and address register usb: isp1760: fix qtd fill length usb: isp1760: fix memory pool initialization usb: typec: tcpm: Fix spelling mistake "atleast" -> "at least" usb: dwc2: Fix spelling mistake "was't" -> "wasn't" usb: renesas_usbhs: Fix spelling mistake "faile" -> "failed" usb: host: xhci-rcar: Don't reload firmware after the completion usb: xhci-mtk: allow bandwidth table rollover usb: mtu3: fix random remote wakeup usb: mtu3: return successful suspend status usb: xhci-mtk: Do not use xhci's virt_dev in drop_endpoint usb: xhci-mtk: modify the SOF/ITP interval for mt8195 usb: xhci-mtk: add a member of num_esit usb: xhci-mtk: check boundary before check tt usb: xhci-mtk: update fs bus bandwidth by bw_budget_table usb: xhci-mtk: fix issue of out-of-bounds array access usb: xhci-mtk: support option to disable usb2 ports usb: xhci-mtk: fix use-after-free of mtk->hcd ...
2 parents 7c314bd + 9c1587d commit 07281a2

File tree

123 files changed

+3994
-1181
lines changed

Some content is hidden

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

123 files changed

+3994
-1181
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,19 @@ Description:
88
c_chmask capture channel mask
99
c_srate capture sampling rate
1010
c_ssize capture sample size (bytes)
11+
c_mute_present capture mute control enable
12+
c_volume_present capture volume control enable
13+
c_volume_min capture volume control min value (in 1/256 dB)
14+
c_volume_max capture volume control max value (in 1/256 dB)
15+
c_volume_res capture volume control resolution (in 1/256 dB)
1116
p_chmask playback channel mask
1217
p_srate playback sampling rate
1318
p_ssize playback sample size (bytes)
19+
p_mute_present playback mute control enable
20+
p_volume_present playback volume control enable
21+
p_volume_min playback volume control min value (in 1/256 dB)
22+
p_volume_max playback volume control max value (in 1/256 dB)
23+
p_volume_res playback volume control resolution (in 1/256 dB)
1424
req_number the number of pre-allocated request
1525
for both capture and playback
1626
========== ===================================

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,18 @@ Description:
99
c_srate capture sampling rate
1010
c_ssize capture sample size (bytes)
1111
c_sync capture synchronization type (async/adaptive)
12+
c_mute_present capture mute control enable
13+
c_volume_present capture volume control enable
14+
c_volume_min capture volume control min value (in 1/256 dB)
15+
c_volume_max capture volume control max value (in 1/256 dB)
16+
c_volume_res capture volume control resolution (in 1/256 dB)
1217
fb_max maximum extra bandwidth in async mode
1318
p_chmask playback channel mask
1419
p_srate playback sampling rate
1520
p_ssize playback sample size (bytes)
21+
p_mute_present playback mute control enable
22+
p_volume_present playback volume control enable
23+
p_volume_min playback volume control min value (in 1/256 dB)
24+
p_volume_max playback volume control max value (in 1/256 dB)
25+
p_volume_res playback volume control resolution (in 1/256 dB)
1626
========= ============================

Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ properties:
111111
- 1.5A
112112
- 3.0A
113113

114+
pd-disable:
115+
description: Set this property if the Type-C connector has no power delivery support.
116+
type: boolean
117+
114118
# The following are optional properties for "usb-c-connector" with power
115119
# delivery support.
116120
source-pdos:

Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
compatible:
1515
enum:
1616
- qcom,sc7180-qmp-usb3-dp-phy
17+
- qcom,sc7280-qmp-usb3-dp-phy
1718
- qcom,sc8180x-qmp-usb3-dp-phy
1819
- qcom,sdm845-qmp-usb3-dp-phy
1920
- qcom,sm8250-qmp-usb3-dp-phy

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ properties:
3434
- allwinner,sun6i-a31-ehci
3535
- allwinner,sun7i-a20-ehci
3636
- allwinner,sun8i-a23-ehci
37+
- allwinner,sun8i-a83t-ehci
3738
- allwinner,sun8i-h3-ehci
3839
- allwinner,sun8i-r40-ehci
3940
- allwinner,sun9i-a80-ehci
@@ -142,6 +143,11 @@ properties:
142143
iommus:
143144
maxItems: 1
144145

146+
dr_mode:
147+
enum:
148+
- host
149+
- otg
150+
145151
required:
146152
- compatible
147153
- reg

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
- allwinner,sun6i-a31-ohci
2525
- allwinner,sun7i-a20-ohci
2626
- allwinner,sun8i-a23-ohci
27+
- allwinner,sun8i-a83t-ohci
2728
- allwinner,sun8i-h3-ohci
2829
- allwinner,sun8i-r40-ohci
2930
- allwinner,sun9i-a80-ohci
@@ -109,6 +110,11 @@ properties:
109110
iommus:
110111
maxItems: 1
111112

113+
dr_mode:
114+
enum:
115+
- host
116+
- otg
117+
112118
required:
113119
- compatible
114120
- reg

Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ properties:
3131
- mediatek,mt8173-xhci
3232
- mediatek,mt8183-xhci
3333
- mediatek,mt8192-xhci
34+
- mediatek,mt8195-xhci
3435
- const: mediatek,mtk-xhci
3536

3637
reg:
@@ -152,6 +153,11 @@ properties:
152153
description: The mask to disable u3ports, bit0 for u3port0,
153154
bit1 for u3port1, ... etc
154155

156+
mediatek,u2p-dis-msk:
157+
$ref: /schemas/types.yaml#/definitions/uint32
158+
description: The mask to disable u2ports, bit0 for u2port0,
159+
bit1 for u2port1, ... etc
160+
155161
"#address-cells":
156162
const: 1
157163

Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,18 @@ properties:
3838
- const: ippc
3939

4040
interrupts:
41-
maxItems: 1
41+
description:
42+
use "interrupts-extended" when the interrupts are connected to the
43+
separate interrupt controllers
44+
minItems: 1
45+
items:
46+
- description: SSUSB device controller interrupt
47+
- description: optional, wakeup interrupt used to support runtime PM
48+
49+
interrupt-names:
50+
items:
51+
- const: device
52+
- const: wakeup
4253

4354
power-domains:
4455
description: A phandle to USB power domain node to control USB's MTCMOS
@@ -106,7 +117,7 @@ properties:
106117
extcon:
107118
deprecated: true
108119
description: |
109-
Phandle to the extcon device detecting the IDDIG/VBUS state, neede
120+
Phandle to the extcon device detecting the IDDIG state, needed
110121
when supports dual-role mode.
111122
It's considered valid for compatibility reasons, not allowed for
112123
new bindings, and use "usb-role-switch" property instead.
@@ -116,6 +127,10 @@ properties:
116127
description: Support role switch.
117128
type: boolean
118129

130+
role-switch-default-mode:
131+
enum: [host, peripheral]
132+
default: host
133+
119134
connector:
120135
$ref: /connector/usb-connector.yaml#
121136
description:
@@ -166,6 +181,12 @@ properties:
166181
description: The mask to disable u3ports, bit0 for u3port0,
167182
bit1 for u3port1, ... etc
168183

184+
mediatek,u2p-dis-msk:
185+
$ref: /schemas/types.yaml#/definitions/uint32
186+
description: The mask to disable u2ports, bit0 for u2port0,
187+
bit1 for u2port1, ... etc; but can't disable u2port0 if dual role mode
188+
is enabled, so will be skipped in this case.
189+
169190
# Required child node when support dual-role
170191
patternProperties:
171192
"^usb@[0-9a-f]+$":
@@ -178,6 +199,7 @@ patternProperties:
178199
dependencies:
179200
connector: [ 'usb-role-switch' ]
180201
port: [ 'usb-role-switch' ]
202+
role-switch-default-mode: [ 'usb-role-switch' ]
181203
wakeup-source: [ 'mediatek,syscon-wakeup' ]
182204

183205
required:
@@ -230,7 +252,7 @@ examples:
230252
};
231253
};
232254
233-
# Enable/disable device by an input gpio for VBUS pin
255+
# Dual role switch by gpio-usb-b-connector
234256
- |
235257
#include <dt-bindings/gpio/gpio.h>
236258
#include <dt-bindings/power/mt2712-power.h>
@@ -244,13 +266,27 @@ examples:
244266
power-domains = <&scpsys MT2712_POWER_DOMAIN_USB2>;
245267
clocks = <&topckgen CLK_TOP_USB30_SEL>;
246268
clock-names = "sys_ck";
247-
dr_mode = "peripheral";
269+
dr_mode = "otg";
248270
usb-role-switch;
271+
#address-cells = <1>;
272+
#size-cells = <1>;
273+
ranges;
274+
275+
host0: usb@11270000 {
276+
compatible = "mediatek,mt2712-xhci", "mediatek,mtk-xhci";
277+
reg = <0x11270000 0x1000>;
278+
reg-names = "mac";
279+
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_LOW>;
280+
power-domains = <&scpsys MT2712_POWER_DOMAIN_USB>;
281+
clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>;
282+
clock-names = "sys_ck", "ref_ck";
283+
};
249284
250285
connector {
251286
compatible = "gpio-usb-b-connector", "usb-b-connector";
252287
type = "micro";
253-
vbus-gpios = <&pio 13 GPIO_ACTIVE_HIGH>;
288+
id-gpios = <&pio 12 GPIO_ACTIVE_HIGH>;
289+
vbus-supply = <&usb_p0_vbus>;
254290
};
255291
};
256292
@@ -268,6 +304,7 @@ examples:
268304
wakeup-source;
269305
dr_mode = "otg";
270306
usb-role-switch;
307+
role-switch-default-mode = "host";
271308
#address-cells = <1>;
272309
#size-cells = <1>;
273310
ranges;

Documentation/devicetree/bindings/usb/mediatek,musb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- enum:
2020
- mediatek,mt8516-musb
2121
- mediatek,mt2701-musb
22+
- mediatek,mt7623-musb
2223
- const: mediatek,mtk-musb
2324

2425
reg:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
- qcom,msm8998-dwc3
1818
- qcom,sc7180-dwc3
1919
- qcom,sc7280-dwc3
20+
- qcom,sdm660-dwc3
2021
- qcom,sdm845-dwc3
2122
- qcom,sdx55-dwc3
2223
- qcom,sm4250-dwc3

0 commit comments

Comments
 (0)