Skip to content

Commit 56cbcea

Browse files
committed
Merge tag 'usb-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB / Thunderbolt driver updates from Greg KH: "Here is the big set of USB and Thunderbolt driver updates for 6.5-rc1. Included in here are: - Lots of USB4/Thunderbolt additions and updates for new hardware types and fixes as people are starting to get access to the hardware in the wild - new gadget controller driver, cdns2, added - new typec drivers added - xhci driver updates - typec driver updates - usbip driver fixes - usb-serial driver updates and fixes - lots of smaller USB driver updates All of these have been in linux-next for a while with no reported problems" * tag 'usb-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (265 commits) usb: host: xhci-plat: Set XHCI_STATE_REMOVING before resuming XHCI HC usb: host: xhci: Do not re-initialize the XHCI HC if being removed usb: typec: nb7vpq904m: fix CONFIG_DRM dependency usbip: usbip_host: Replace strlcpy with strscpy usb: dwc3: gadget: Propagate core init errors to UDC during pullup USB: serial: option: add LARA-R6 01B PIDs usb: ulpi: Make container_of() no-op in to_ulpi_dev() usb: gadget: legacy: fix error return code in gfs_bind usb: typec: fsa4480: add support for Audio Accessory Mode usb: typec: fsa4480: rework mux & switch setup to handle more states usb: typec: ucsi: call typec_set_mode on non-altmode partner change USB: gadget: f_hid: make hidg_class a static const structure USB: gadget: f_printer: make usb_gadget_class a static const structure USB: mon: make mon_bin_class a static const structure USB: gadget: udc: core: make udc_class a static const structure USB: roles: make role_class a static const structure dt-bindings: usb: dwc3: Add interrupt-names property support for wakeup interrupt dt-bindings: usb: Add StarFive JH7110 USB controller dt-bindings: usb: dwc3: Add IPQ9574 compatible usb: cdns2: Fix spelling mistake in a trace message "Wakupe" -> "Wakeup" ...
2 parents 868a9fd + 18af4b5 commit 56cbcea

264 files changed

Lines changed: 11502 additions & 2328 deletions

File tree

Some content is hidden

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

Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,16 @@ Description:
292292
which is marked with early_stop has failed to initialize, it will ignore
293293
all future connections until this attribute is clear.
294294

295+
What: /sys/bus/usb/devices/.../<hub_interface>/port<X>/state
296+
Date: June 2023
297+
Contact: Roy Luo <royluo@google.com>
298+
Description:
299+
Indicates current state of the USB device attached to the port.
300+
Valid states are: 'not-attached', 'attached', 'powered',
301+
'reconnecting', 'unauthenticated', 'default', 'addressed',
302+
'configured', and 'suspended'. This file supports poll() to
303+
monitor the state change from user space.
304+
295305
What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
296306
Date: May 2013
297307
Contact: Mathias Nyman <mathias.nyman@linux.intel.com>

Documentation/ABI/testing/sysfs-driver-eud

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/bus/platform/drivers/eud/.../enable
1+
What: /sys/bus/platform/drivers/qcom_eud/.../enable
22
Date: February 2022
33
Contact: Souradeep Chowdhury <quic_schowdhu@quicinc.com>
44
Description:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ properties:
6161
power-domains:
6262
maxItems: 1
6363

64+
orientation-switch:
65+
description: Flag the port as possible handler of orientation switching
66+
type: boolean
67+
6468
resets:
6569
items:
6670
- description: reset of phy block.
@@ -251,6 +255,8 @@ examples:
251255
vdda-phy-supply = <&vdda_usb2_ss_1p2>;
252256
vdda-pll-supply = <&vdda_usb2_ss_core>;
253257
258+
orientation-switch;
259+
254260
usb3-phy@200 {
255261
reg = <0x200 0x128>,
256262
<0x400 0x200>,

Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ description: |
1414
regulator will be enabled in situations where the device is required to
1515
provide power to the connected peripheral.
1616
17+
allOf:
18+
- $ref: regulator.yaml#
19+
1720
properties:
1821
compatible:
1922
enum:
@@ -25,8 +28,11 @@ properties:
2528

2629
required:
2730
- compatible
31+
- reg
32+
- regulator-min-microamp
33+
- regulator-max-microamp
2834

29-
additionalProperties: false
35+
unevaluatedProperties: false
3036

3137
examples:
3238
- |
@@ -36,6 +42,8 @@ examples:
3642
pm8150b_vbus: usb-vbus-regulator@1100 {
3743
compatible = "qcom,pm8150b-vbus-reg";
3844
reg = <0x1100>;
45+
regulator-min-microamp = <500000>;
46+
regulator-max-microamp = <3000000>;
3947
};
4048
};
4149
...

Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/reset/xlnx,zynqmp-reset.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Zynq UltraScale+ MPSoC and Versal reset
8+
9+
maintainers:
10+
- Piyush Mehta <piyush.mehta@amd.com>
11+
12+
description: |
13+
The Zynq UltraScale+ MPSoC and Versal has several different resets.
14+
15+
The PS reset subsystem is responsible for handling the external reset
16+
input to the device and that all internal reset requirements are met
17+
for the system (as a whole) and for the functional units.
18+
19+
Please also refer to reset.txt in this directory for common reset
20+
controller binding usage. Device nodes that need access to reset
21+
lines should specify them as a reset phandle in their corresponding
22+
node as specified in reset.txt.
23+
24+
For list of all valid reset indices for Zynq UltraScale+ MPSoC
25+
<dt-bindings/reset/xlnx-zynqmp-resets.h>
26+
27+
For list of all valid reset indices for Versal
28+
<dt-bindings/reset/xlnx-versal-resets.h>
29+
30+
properties:
31+
compatible:
32+
enum:
33+
- xlnx,zynqmp-reset
34+
- xlnx,versal-reset
35+
36+
"#reset-cells":
37+
const: 1
38+
39+
required:
40+
- compatible
41+
- "#reset-cells"
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
zynqmp_reset: reset-controller {
48+
compatible = "xlnx,zynqmp-reset";
49+
#reset-cells = <1>;
50+
};
51+
52+
...

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ properties:
4545
- fsl,vf610-usb
4646
- const: fsl,imx27-usb
4747
- items:
48-
- const: fsl,imx8dxl-usb
48+
- enum:
49+
- fsl,imx8dxl-usb
50+
- fsl,imx8ulp-usb
4951
- const: fsl,imx7ulp-usb
5052
- const: fsl,imx6ul-usb
5153
- items:

Documentation/devicetree/bindings/usb/dwc2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ properties:
5353
- amlogic,meson8b-usb
5454
- amlogic,meson-gxbb-usb
5555
- amlogic,meson-g12a-usb
56+
- amlogic,meson-a1-usb
5657
- intel,socfpga-agilex-hsotg
5758
- const: snps,dwc2
5859
- const: amcc,dwc-otg
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (c) 2020 NXP
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/usb/fsl,imx8qm-cdns3.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: NXP iMX8QM Soc USB Controller
9+
10+
maintainers:
11+
- Frank Li <Frank.Li@nxp.com>
12+
13+
properties:
14+
compatible:
15+
const: fsl,imx8qm-usb3
16+
17+
reg:
18+
items:
19+
- description: Register set for iMX USB3 Platform Control
20+
21+
"#address-cells":
22+
enum: [ 1, 2 ]
23+
24+
"#size-cells":
25+
enum: [ 1, 2 ]
26+
27+
ranges: true
28+
29+
clocks:
30+
items:
31+
- description: Standby clock. Used during ultra low power states.
32+
- description: USB bus clock for usb3 controller.
33+
- description: AXI clock for AXI interface.
34+
- description: ipg clock for register access.
35+
- description: Core clock for usb3 controller.
36+
37+
clock-names:
38+
items:
39+
- const: lpm
40+
- const: bus
41+
- const: aclk
42+
- const: ipg
43+
- const: core
44+
45+
power-domains:
46+
maxItems: 1
47+
48+
# Required child node:
49+
50+
patternProperties:
51+
"^usb@[0-9a-f]+$":
52+
$ref: cdns,usb3.yaml#
53+
54+
required:
55+
- compatible
56+
- reg
57+
- "#address-cells"
58+
- "#size-cells"
59+
- ranges
60+
- clocks
61+
- clock-names
62+
- power-domains
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/clock/imx8-lpcg.h>
69+
#include <dt-bindings/firmware/imx/rsrc.h>
70+
#include <dt-bindings/interrupt-controller/arm-gic.h>
71+
72+
usb@5b110000 {
73+
compatible = "fsl,imx8qm-usb3";
74+
reg = <0x5b110000 0x10000>;
75+
ranges;
76+
clocks = <&usb3_lpcg IMX_LPCG_CLK_1>,
77+
<&usb3_lpcg IMX_LPCG_CLK_0>,
78+
<&usb3_lpcg IMX_LPCG_CLK_7>,
79+
<&usb3_lpcg IMX_LPCG_CLK_4>,
80+
<&usb3_lpcg IMX_LPCG_CLK_5>;
81+
clock-names = "lpm", "bus", "aclk", "ipg", "core";
82+
assigned-clocks = <&clk IMX_SC_R_USB_2 IMX_SC_PM_CLK_MST_BUS>;
83+
assigned-clock-rates = <250000000>;
84+
power-domains = <&pd IMX_SC_R_USB_2>;
85+
#address-cells = <1>;
86+
#size-cells = <1>;
87+
88+
usb@5b120000 {
89+
compatible = "cdns,usb3";
90+
reg = <0x5b120000 0x10000>, /* memory area for OTG/DRD registers */
91+
<0x5b130000 0x10000>, /* memory area for HOST registers */
92+
<0x5b140000 0x10000>; /* memory area for DEVICE registers */
93+
reg-names = "otg", "xhci", "dev";
94+
interrupt-parent = <&gic>;
95+
interrupts = <GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,
96+
<GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,
97+
<GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,
98+
<GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>;
99+
interrupt-names = "host", "peripheral", "otg", "wakeup";
100+
phys = <&usb3_phy>;
101+
phy-names = "cdns3,usb3-phy";
102+
};
103+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ properties:
6161
- ibm,476gtr-ehci
6262
- nxp,lpc1850-ehci
6363
- qca,ar7100-ehci
64+
- rockchip,rk3588-ehci
6465
- snps,hsdk-v1.0-ehci
6566
- socionext,uniphier-ehci
6667
- const: generic-ehci

0 commit comments

Comments
 (0)