Skip to content

Commit 710f5d6

Browse files
committed
Merge tag 'usb-5.18-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 5.18-rc1. Nothing major in here, just lots of little improvements and cleanups and new device support. Highlights are: - list iterator fixups for when we walk past the end of the list (a common problem that was cut/pasted in almost all USB gadget drivers) - xen USB driver "hardening" for malicious hosts - xhci driver updates and fixes for more hardware types - xhci debug cable fixes to make it actually work again - usb gadget audio driver improvements - usb gadget storage fixes to work with OS-X - lots of other small usb gadget fixes and updates - USB DWC3 driver improvements for more hardware types - Lots of other small USB driver improvements - DTS updates for some USB platforms All of these have been in linux-next for a while with no reported issues" * tag 'usb-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (172 commits) usb: gadget: fsl_qe_udc: Add missing semicolon in qe_ep_dequeue() dt-bindings: usb: mtk-xhci: add compatible for mt8186 usb: dwc3: Issue core soft reset before enabling run/stop usb: gadget: Makefile: remove ccflags-y USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c usb: gadget: eliminate anonymous module_init & module_exit usb: usbip: eliminate anonymous module_init & module_exit xen/usb: harden xen_hcd against malicious backends usb: dwc3: gadget: Wait for ep0 xfers to complete during dequeue usb: dwc3: gadget: move cmd_endtransfer to extra function usb: dwc3: gadget: ep_queue simplify isoc start condition xen/usb: don't use arbitrary_virt_to_machine() usb: isp1760: remove redundant max_packet() macro usb: oxu210hp-hcd: remove redundant call to max_packet() macro usb: common: usb-conn-gpio: Make VBUS supply completely optional USB: storage: ums-realtek: fix error code in rts51x_read_mem() usb: early: xhci-dbc: Fix xdbc number parsing usb: early: xhci-dbc: Remove duplicate keep parsing x86/tsc: Be consistent about use_tsc_delay() usb: gadget: udc: s3c2410: remove usage of list iterator past the loop body ...
2 parents 5627ecb + 46d2c20 commit 710f5d6

File tree

143 files changed

+4892
-1254
lines changed

Some content is hidden

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

143 files changed

+4892
-1254
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Description:
66

77
===================== =======================================
88
c_chmask capture channel mask
9-
c_srate capture sampling rate
9+
c_srate list of capture sampling rates (comma-separated)
1010
c_ssize capture sample size (bytes)
1111
c_mute_present capture mute control enable
1212
c_volume_present capture volume control enable
@@ -17,7 +17,7 @@ Description:
1717
c_volume_res capture volume control resolution
1818
(in 1/256 dB)
1919
p_chmask playback channel mask
20-
p_srate playback sampling rate
20+
p_srate list of playback sampling rates (comma-separated)
2121
p_ssize playback sample size (bytes)
2222
p_mute_present playback mute control enable
2323
p_volume_present playback volume control enable
@@ -29,4 +29,5 @@ Description:
2929
(in 1/256 dB)
3030
req_number the number of pre-allocated requests
3131
for both capture and playback
32+
function_name name of the interface
3233
===================== =======================================

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ Description:
66

77
===================== =======================================
88
c_chmask capture channel mask
9-
c_srate capture sampling rate
9+
c_srate list of capture sampling rates (comma-separated)
1010
c_ssize capture sample size (bytes)
11+
c_hs_bint capture bInterval for HS/SS (1-4: fixed, 0: auto)
1112
c_sync capture synchronization type
1213
(async/adaptive)
1314
c_mute_present capture mute control enable
@@ -20,8 +21,9 @@ Description:
2021
(in 1/256 dB)
2122
fb_max maximum extra bandwidth in async mode
2223
p_chmask playback channel mask
23-
p_srate playback sampling rate
24+
p_srate list of playback sampling rates (comma-separated)
2425
p_ssize playback sample size (bytes)
26+
p_hs_bint playback bInterval for HS/SS (1-4: fixed, 0: auto)
2527
p_mute_present playback mute control enable
2628
p_volume_present playback volume control enable
2729
p_volume_min playback volume control min value
@@ -32,4 +34,5 @@ Description:
3234
(in 1/256 dB)
3335
req_number the number of pre-allocated requests
3436
for both capture and playback
37+
function_name name of the interface
3538
===================== =======================================
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/platform/drivers/eud/.../enable
2+
Date: February 2022
3+
Contact: Souradeep Chowdhury <[email protected]>
4+
Description:
5+
The Enable/Disable sysfs interface for Embedded
6+
USB Debugger(EUD). This enables and disables the
7+
EUD based on a 1 or a 0 value. By enabling EUD,
8+
the user is able to activate the mini-usb hub of
9+
EUD for debug and trace capabilities.
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/soc/qcom/qcom,eud.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Qualcomm Embedded USB Debugger
8+
9+
maintainers:
10+
- Souradeep Chowdhury <[email protected]>
11+
12+
description:
13+
This binding is used to describe the Qualcomm Embedded USB Debugger, which is
14+
mini USB-hub implemented on chip to support USB-based debug capabilities.
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- qcom,sc7280-eud
21+
- const: qcom,eud
22+
23+
reg:
24+
items:
25+
- description: EUD Base Register Region
26+
- description: EUD Mode Manager Register
27+
28+
interrupts:
29+
description: EUD interrupt
30+
maxItems: 1
31+
32+
ports:
33+
$ref: /schemas/graph.yaml#/properties/ports
34+
description:
35+
These ports is to be attached to the endpoint of the DWC3 controller node
36+
and type C connector node. The controller has the "usb-role-switch"
37+
property.
38+
39+
properties:
40+
port@0:
41+
$ref: /schemas/graph.yaml#/properties/port
42+
description: This port is to be attached to the DWC3 controller.
43+
44+
port@1:
45+
$ref: /schemas/graph.yaml#/properties/port
46+
description: This port is to be attached to the type C connector.
47+
48+
required:
49+
- compatible
50+
- reg
51+
- ports
52+
53+
additionalProperties: false
54+
55+
examples:
56+
- |
57+
eud@88e0000 {
58+
compatible = "qcom,sc7280-eud","qcom,eud";
59+
reg = <0x88e0000 0x2000>,
60+
<0x88e2000 0x1000>;
61+
ports {
62+
#address-cells = <1>;
63+
#size-cells = <0>;
64+
port@0 {
65+
reg = <0>;
66+
eud_ep: endpoint {
67+
remote-endpoint = <&usb2_role_switch>;
68+
};
69+
};
70+
port@1 {
71+
reg = <1>;
72+
eud_con: endpoint {
73+
remote-endpoint = <&con_eud>;
74+
};
75+
};
76+
};
77+
};

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

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

Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ properties:
1515
const: fsl,imx8mp-dwc3
1616

1717
reg:
18-
maxItems: 1
19-
description: Address and length of the register set for the wrapper of
20-
dwc3 core on the SOC.
18+
items:
19+
- description: Address and length of the register set for HSIO Block Control
20+
- description: Address and length of the register set for the wrapper of dwc3 core on the SOC.
2121

2222
"#address-cells":
2323
enum: [ 1, 2 ]
@@ -49,6 +49,28 @@ properties:
4949
- const: hsio
5050
- const: suspend
5151

52+
fsl,permanently-attached:
53+
type: boolean
54+
description:
55+
Indicates if the device atached to a downstream port is
56+
permanently attached.
57+
58+
fsl,disable-port-power-control:
59+
type: boolean
60+
description:
61+
Indicates whether the host controller implementation includes port
62+
power control. Defines Bit 3 in capability register (HCCPARAMS).
63+
64+
fsl,over-current-active-low:
65+
type: boolean
66+
description:
67+
Over current signal polarity is active low.
68+
69+
fsl,power-active-low:
70+
type: boolean
71+
description:
72+
Power pad (PWR) polarity is active low.
73+
5274
# Required child node:
5375

5476
patternProperties:
@@ -74,7 +96,8 @@ examples:
7496
#include <dt-bindings/interrupt-controller/arm-gic.h>
7597
usb3_0: usb@32f10100 {
7698
compatible = "fsl,imx8mp-dwc3";
77-
reg = <0x32f10100 0x8>;
99+
reg = <0x32f10100 0x8>,
100+
<0x381f0000 0x20>;
78101
clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
79102
<&clk IMX8MP_CLK_USB_ROOT>;
80103
clock-names = "hsio", "suspend";

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ properties:
3030
- mediatek,mt7629-xhci
3131
- mediatek,mt8173-xhci
3232
- mediatek,mt8183-xhci
33+
- mediatek,mt8186-xhci
3334
- mediatek,mt8192-xhci
3435
- mediatek,mt8195-xhci
3536
- const: mediatek,mtk-xhci
@@ -146,7 +147,11 @@ properties:
146147
2 - used by mt2712 etc, revision 2 following IPM rule;
147148
101 - used by mt8183, specific 1.01;
148149
102 - used by mt8192, specific 1.02;
149-
enum: [1, 2, 101, 102]
150+
103 - used by mt8195, IP0, specific 1.03;
151+
104 - used by mt8195, IP1, specific 1.04;
152+
105 - used by mt8195, IP2, specific 1.05;
153+
106 - used by mt8195, IP3, specific 1.06;
154+
enum: [1, 2, 101, 102, 103, 104, 105, 106]
150155
151156
mediatek,u3p-dis-msk:
152157
$ref: /schemas/types.yaml#/definitions/uint32
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/microchip,mpfs-musb.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip MPFS USB Controller Device Tree Bindings
8+
9+
allOf:
10+
- $ref: usb-drd.yaml#
11+
12+
maintainers:
13+
- Conor Dooley <[email protected]>
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- microchip,mpfs-musb
19+
20+
dr_mode: true
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
minItems: 2
27+
maxItems: 2
28+
29+
interrupt-names:
30+
items:
31+
- const: dma
32+
- const: mc
33+
34+
clocks:
35+
maxItems: 1
36+
37+
required:
38+
- compatible
39+
- reg
40+
- interrupts
41+
- interrupt-names
42+
- clocks
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
#include "dt-bindings/clock/microchip,mpfs-clock.h"
49+
usb@20201000 {
50+
compatible = "microchip,mpfs-musb";
51+
reg = <0x20201000 0x1000>;
52+
clocks = <&clkcfg CLK_USB>;
53+
interrupt-parent = <&plic>;
54+
interrupts = <86>, <87>;
55+
interrupt-names = "dma", "mc";
56+
dr_mode = "host";
57+
};
58+
59+
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
- qcom,ipq4019-dwc3
1717
- qcom,ipq6018-dwc3
1818
- qcom,ipq8064-dwc3
19+
- qcom,msm8953-dwc3
1920
- qcom,msm8996-dwc3
2021
- qcom,msm8998-dwc3
2122
- qcom,sc7180-dwc3

0 commit comments

Comments
 (0)