Skip to content

Commit c6dbef7

Browse files
committed
Merge tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY/Thunderbolt driver updates from Greg KH: "Here is the big set of USB, PHY, and Thunderbolt driver updates for 5.10-rc1. Lots of tiny different things for these subsystems are in here, including: - phy driver updates - thunderbolt / USB 4 updates and additions - USB gadget driver updates - xhci fixes and updates - typec driver additions and updates - api conversions to various drivers for core kernel api changes - new USB control message functions to make it harder to get wrong, as found by syzbot (took 2 tries to get it right) - lots of tiny USB driver fixes and updates all over the place All of these have been in linux-next for a while, with the exception of the last "obviously correct" patch that updated a FALLTHROUGH comment that got merged last weekend" * tag 'usb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (374 commits) usb: musb: gadget: Use fallthrough pseudo-keyword usb: typec: Add QCOM PMIC typec detection driver USB: serial: option: add Cellient MPL200 card usb: typec: tcpci_maxim: Add support for Sink FRS usb: typec: tcpci: Implement callbacks for FRS usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS) usb: typec: tcpci_maxim: Chip level TCPC driver usb: typec: tcpci: Add set_vbus tcpci callback usb: typec: tcpci: Add a getter method to retrieve tcpm_port reference usbip: vhci_hcd: fix calling usb_hcd_giveback_urb() with irqs enabled usb: cdc-acm: add quirk to blacklist ETAS ES58X devices USB: serial: ftdi_sio: use cur_altsetting for consistency USB: serial: option: Add Telit FT980-KS composition USB: core: remove polling for /sys/kernel/debug/usb/devices usb: typec: add support for STUSB160x Type-C controller family usb: typec: add typec_find_pwr_opmode usb: typec: hd3ss3220: Use OF graph API to get the connector fwnode dt-bindings: usb: renesas,usb3-peri: Document HS and SS data bus dt-bindings: usb: convert ti,hd3ss3220 bindings to json-schema usb: dwc2: Fix INTR OUT transfers in DDMA mode. ...
2 parents ade7afe + 93578a2 commit c6dbef7

File tree

260 files changed

+12933
-2874
lines changed

Some content is hidden

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

260 files changed

+12933
-2874
lines changed

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,22 @@ properties:
4848
- compatible
4949
- "#clock-cells"
5050

51+
reset:
52+
type: object
53+
54+
properties:
55+
compatible:
56+
const: raspberrypi,firmware-reset
57+
58+
"#reset-cells":
59+
const: 1
60+
description: >
61+
The argument is the ID of the firmware reset line to affect.
62+
63+
required:
64+
- compatible
65+
- "#reset-cells"
66+
5167
additionalProperties: false
5268

5369
required:
@@ -66,5 +82,10 @@ examples:
6682
compatible = "raspberrypi,firmware-clocks";
6783
#clock-cells = <1>;
6884
};
85+
86+
reset: reset {
87+
compatible = "raspberrypi,firmware-reset";
88+
#reset-cells = <1>;
89+
};
6990
};
7091
...

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
* Freescale i.MX8MQ USB3 PHY binding
22

33
Required properties:
4-
- compatible: Should be "fsl,imx8mq-usb-phy"
4+
- compatible: Should be "fsl,imx8mq-usb-phy" or "fsl,imx8mp-usb-phy"
55
- #phys-cells: must be 0 (see phy-bindings.txt in this directory)
66
- reg: The base address and length of the registers
77
- clocks: phandles to the clocks for each clock listed in clock-names

Documentation/devicetree/bindings/phy/intel,lgm-emmc-phy.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ description: |+
2323
2424
properties:
2525
compatible:
26-
const: intel,lgm-emmc-phy
26+
oneOf:
27+
- const: intel,lgm-emmc-phy
28+
- const: intel,keembay-emmc-phy
2729

2830
"#phy-cells":
2931
const: 0
@@ -34,6 +36,10 @@ properties:
3436
clocks:
3537
maxItems: 1
3638

39+
clock-names:
40+
items:
41+
- const: emmcclk
42+
3743
required:
3844
- "#phy-cells"
3945
- compatible
@@ -57,4 +63,13 @@ examples:
5763
#phy-cells = <0>;
5864
};
5965
};
66+
67+
- |
68+
phy@20290000 {
69+
compatible = "intel,keembay-emmc-phy";
70+
reg = <0x20290000 0x54>;
71+
clocks = <&emmc>;
72+
clock-names = "emmcclk";
73+
#phy-cells = <0>;
74+
};
6075
...
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/intel,lgm-usb-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Intel LGM USB PHY Device Tree Bindings
8+
9+
maintainers:
10+
- Vadivel Murugan Ramuthevar <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: intel,lgm-usb-phy
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
resets:
23+
items:
24+
- description: USB PHY and Host controller reset
25+
- description: APB BUS reset
26+
- description: General Hardware reset
27+
28+
reset-names:
29+
items:
30+
- const: phy
31+
- const: apb
32+
- const: phy31
33+
34+
"#phy-cells":
35+
const: 0
36+
37+
required:
38+
- compatible
39+
- clocks
40+
- reg
41+
- resets
42+
- reset-names
43+
- "#phy-cells"
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
usb-phy@e7e00000 {
50+
compatible = "intel,lgm-usb-phy";
51+
reg = <0xe7e00000 0x10000>;
52+
clocks = <&cgu0 153>;
53+
resets = <&rcu 0x70 0x24>,
54+
<&rcu 0x70 0x26>,
55+
<&rcu 0x70 0x28>;
56+
reset-names = "phy", "apb", "phy31";
57+
#phy-cells = <0>;
58+
};

Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml

Lines changed: 79 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
$id: "http://devicetree.org/schemas/phy/phy-cadence-torrent.yaml#"
55
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
66

7-
title: Cadence Torrent SD0801 PHY binding for DisplayPort
7+
title: Cadence Torrent SD0801 PHY binding
88

99
description:
1010
This binding describes the Cadence SD0801 PHY (also known as Torrent PHY)
11-
hardware included with the Cadence MHDP DisplayPort controller.
11+
hardware included with the Cadence MHDP DisplayPort controller. Torrent
12+
PHY also supports multilink multiprotocol combinations including protocols
13+
such as PCIe, USB, SGMII, QSGMII etc.
1214

1315
maintainers:
1416
- Swapnil Jakhade <[email protected]>
@@ -49,20 +51,30 @@ properties:
4951
- const: dptx_phy
5052

5153
resets:
52-
maxItems: 1
53-
description:
54-
Torrent PHY reset.
55-
See Documentation/devicetree/bindings/reset/reset.txt
54+
minItems: 1
55+
maxItems: 2
56+
items:
57+
- description: Torrent PHY reset.
58+
- description: Torrent APB reset. This is optional.
59+
60+
reset-names:
61+
minItems: 1
62+
maxItems: 2
63+
items:
64+
- const: torrent_reset
65+
- const: torrent_apb
5666

5767
patternProperties:
58-
'^phy@[0-7]+$':
68+
'^phy@[0-3]$':
5969
type: object
6070
description:
6171
Each group of PHY lanes with a single master lane should be represented as a sub-node.
6272
properties:
6373
reg:
6474
description:
6575
The master lane number. This is the lowest numbered lane in the lane group.
76+
minimum: 0
77+
maximum: 3
6678

6779
resets:
6880
minItems: 1
@@ -78,15 +90,25 @@ patternProperties:
7890
Specifies the type of PHY for which the group of PHY lanes is used.
7991
Refer include/dt-bindings/phy/phy.h. Constants from the header should be used.
8092
$ref: /schemas/types.yaml#/definitions/uint32
81-
enum: [1, 2, 3, 4, 5, 6]
93+
minimum: 1
94+
maximum: 9
8295

8396
cdns,num-lanes:
8497
description:
85-
Number of DisplayPort lanes.
98+
Number of lanes.
8699
$ref: /schemas/types.yaml#/definitions/uint32
87-
enum: [1, 2, 4]
100+
enum: [1, 2, 3, 4]
88101
default: 4
89102

103+
cdns,ssc-mode:
104+
description:
105+
Specifies the Spread Spectrum Clocking mode used. It can be NO_SSC,
106+
EXTERNAL_SSC or INTERNAL_SSC.
107+
Refer include/dt-bindings/phy/phy-cadence-torrent.h for the constants to be used.
108+
$ref: /schemas/types.yaml#/definitions/uint32
109+
enum: [0, 1, 2]
110+
default: 0
111+
90112
cdns,max-bit-rate:
91113
description:
92114
Maximum DisplayPort link bit rate to use, in Mbps
@@ -99,6 +121,7 @@ patternProperties:
99121
- resets
100122
- "#phy-cells"
101123
- cdns,phy-type
124+
- cdns,num-lanes
102125

103126
additionalProperties: false
104127

@@ -111,6 +134,7 @@ required:
111134
- reg
112135
- reg-names
113136
- resets
137+
- reset-names
114138

115139
additionalProperties: false
116140

@@ -128,18 +152,56 @@ examples:
128152
<0xf0 0xfb030a00 0x0 0x00000040>;
129153
reg-names = "torrent_phy", "dptx_phy";
130154
resets = <&phyrst 0>;
155+
reset-names = "torrent_reset";
131156
clocks = <&ref_clk>;
132157
clock-names = "refclk";
133158
#address-cells = <1>;
134159
#size-cells = <0>;
135160
phy@0 {
136-
reg = <0>;
137-
resets = <&phyrst 1>, <&phyrst 2>,
138-
<&phyrst 3>, <&phyrst 4>;
139-
#phy-cells = <0>;
140-
cdns,phy-type = <PHY_TYPE_DP>;
141-
cdns,num-lanes = <4>;
142-
cdns,max-bit-rate = <8100>;
161+
reg = <0>;
162+
resets = <&phyrst 1>, <&phyrst 2>,
163+
<&phyrst 3>, <&phyrst 4>;
164+
#phy-cells = <0>;
165+
cdns,phy-type = <PHY_TYPE_DP>;
166+
cdns,num-lanes = <4>;
167+
cdns,max-bit-rate = <8100>;
168+
};
169+
};
170+
};
171+
- |
172+
#include <dt-bindings/phy/phy.h>
173+
#include <dt-bindings/phy/phy-cadence-torrent.h>
174+
175+
bus {
176+
#address-cells = <2>;
177+
#size-cells = <2>;
178+
179+
torrent-phy@f0fb500000 {
180+
compatible = "cdns,torrent-phy";
181+
reg = <0xf0 0xfb500000 0x0 0x00100000>;
182+
reg-names = "torrent_phy";
183+
resets = <&phyrst 0>, <&phyrst 1>;
184+
reset-names = "torrent_reset", "torrent_apb";
185+
clocks = <&ref_clk>;
186+
clock-names = "refclk";
187+
#address-cells = <1>;
188+
#size-cells = <0>;
189+
phy@0 {
190+
reg = <0>;
191+
resets = <&phyrst 2>, <&phyrst 3>;
192+
#phy-cells = <0>;
193+
cdns,phy-type = <PHY_TYPE_PCIE>;
194+
cdns,num-lanes = <2>;
195+
cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>;
196+
};
197+
198+
phy@2 {
199+
reg = <2>;
200+
resets = <&phyrst 4>;
201+
#phy-cells = <0>;
202+
cdns,phy-type = <PHY_TYPE_SGMII>;
203+
cdns,num-lanes = <1>;
204+
cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>;
143205
};
144206
};
145207
};

0 commit comments

Comments
 (0)