Skip to content

Commit cc8b10f

Browse files
committed
Merge tag 'usb-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB / Thunderbolt driver updates from Greg KH: "Here is the USB and Thunderbolt driver updates for 6.14-rc1. Nothing huge in here, just lots of new hardware support and updates for existing drivers. Changes here are: - big gadget f_tcm driver update - other gadget driver updates and fixes - thunderbolt driver updates for new hardware and capabilities and lots more debugging functionality to handle it when things aren't working well. - xhci driver updates - new USB-serial device updates - typec driver updates, including a chrome platform driver (acked by the subsystem maintainers) - other small driver updates All of these have been in linux-next for a while with no reported issues" * tag 'usb-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (123 commits) usb: hcd: Bump local buffer size in rh_string() Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null" usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS usb: xhci: tegra: Fix OF boolean read warning usb: host: xhci-plat: add support compatible ID PNP0D15 usb: typec: ucsi: Add a macro definition for UCSI v1.0 usb: dwc3: core: Defer the probe until USB power supply ready usbip: Correct format specifier for seqnum from %d to %u usbip: Fix seqnum sign extension issue in vhci_tx_urb dt-bindings: usb: snps,dwc3: Split core description usb: quirks: Add NO_LPM quirk for TOSHIBA TransMemory-Mx device usb: dwc3: gadget: Reinitiate stream for all host NoStream behavior USB: Use str_enable_disable-like helpers USB: gadget: Use str_enable_disable-like helpers USB: phy: Use str_enable_disable-like helpers USB: typec: Use str_enable_disable-like helpers USB: host: Use str_enable_disable-like helpers USB: Replace own str_plural with common one USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb() usb: phy: Remove API devm_usb_put_phy() ...
2 parents 078eac2 + 70cd057 commit cc8b10f

File tree

142 files changed

+3833
-1483
lines changed

Some content is hidden

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

142 files changed

+3833
-1483
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,13 @@ properties:
293293
PD negotiation till BC1.2 detection completes.
294294
default: 0
295295

296+
pd-revision:
297+
description: Specifies the maximum USB PD revision and version supported by
298+
the connector. This property is specified in the following order;
299+
<revision_major, revision_minor, version_major, version_minor>.
300+
$ref: /schemas/types.yaml#/definitions/uint8-array
301+
maxItems: 4
302+
296303
dependencies:
297304
sink-vdos-v1: [ sink-vdos ]
298305
sink-vdos: [ sink-vdos-v1 ]

Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,27 +113,27 @@ examples:
113113
- |
114114
#include <dt-bindings/clock/aspeed-clock.h>
115115
vhub: usb-vhub@1e6a0000 {
116-
compatible = "aspeed,ast2500-usb-vhub";
117-
reg = <0x1e6a0000 0x300>;
118-
interrupts = <5>;
119-
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
120-
aspeed,vhub-downstream-ports = <5>;
121-
aspeed,vhub-generic-endpoints = <15>;
122-
pinctrl-names = "default";
123-
pinctrl-0 = <&pinctrl_usb2ad_default>;
124-
125-
vhub-vendor-id = <0x1d6b>;
126-
vhub-product-id = <0x0107>;
127-
vhub-device-revision = <0x0100>;
128-
vhub-strings {
129-
#address-cells = <1>;
130-
#size-cells = <0>;
131-
132-
string@409 {
133-
reg = <0x409>;
134-
manufacturer = "ASPEED";
135-
product = "USB Virtual Hub";
136-
serial-number = "0000";
137-
};
116+
compatible = "aspeed,ast2500-usb-vhub";
117+
reg = <0x1e6a0000 0x300>;
118+
interrupts = <5>;
119+
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
120+
aspeed,vhub-downstream-ports = <5>;
121+
aspeed,vhub-generic-endpoints = <15>;
122+
pinctrl-names = "default";
123+
pinctrl-0 = <&pinctrl_usb2ad_default>;
124+
125+
vhub-vendor-id = <0x1d6b>;
126+
vhub-product-id = <0x0107>;
127+
vhub-device-revision = <0x0100>;
128+
vhub-strings {
129+
#address-cells = <1>;
130+
#size-cells = <0>;
131+
132+
string@409 {
133+
reg = <0x409>;
134+
manufacturer = "ASPEED";
135+
product = "USB Virtual Hub";
136+
serial-number = "0000";
138137
};
138+
};
139139
};

Documentation/devicetree/bindings/usb/brcm,bdc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ additionalProperties: false
4141

4242
examples:
4343
- |
44-
usb@f0b02000 {
45-
compatible = "brcm,bdc-udc-v2";
46-
reg = <0xf0b02000 0xfc4>;
47-
interrupts = <0x0 0x60 0x0>;
48-
phys = <&usbphy_0 0x0>;
49-
clocks = <&sw_usbd>;
50-
};
44+
usb@f0b02000 {
45+
compatible = "brcm,bdc-udc-v2";
46+
reg = <0xf0b02000 0xfc4>;
47+
interrupts = <0x0 0x60 0x0>;
48+
phys = <&usbphy_0 0x0>;
49+
clocks = <&sw_usbd>;
50+
};

Documentation/devicetree/bindings/usb/cypress,hx3.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,21 @@ examples:
5656
5757
/* 2.0 hub on port 1 */
5858
hub_2_0: hub@1 {
59-
compatible = "usb4b4,6504";
60-
reg = <1>;
61-
peer-hub = <&hub_3_0>;
62-
reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
63-
vdd-supply = <&reg_1v2_usb>;
64-
vdd2-supply = <&reg_3v3_usb>;
59+
compatible = "usb4b4,6504";
60+
reg = <1>;
61+
peer-hub = <&hub_3_0>;
62+
reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
63+
vdd-supply = <&reg_1v2_usb>;
64+
vdd2-supply = <&reg_3v3_usb>;
6565
};
6666
6767
/* 3.0 hub on port 2 */
6868
hub_3_0: hub@2 {
69-
compatible = "usb4b4,6506";
70-
reg = <2>;
71-
peer-hub = <&hub_2_0>;
72-
reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
73-
vdd-supply = <&reg_1v2_usb>;
74-
vdd2-supply = <&reg_3v3_usb>;
69+
compatible = "usb4b4,6506";
70+
reg = <2>;
71+
peer-hub = <&hub_2_0>;
72+
reset-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
73+
vdd-supply = <&reg_1v2_usb>;
74+
vdd2-supply = <&reg_3v3_usb>;
7575
};
7676
};

Documentation/devicetree/bindings/usb/dwc2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ unevaluatedProperties: false
192192

193193
examples:
194194
- |
195-
usb@101c0000 {
195+
usb@101c0000 {
196196
compatible = "rockchip,rk3066-usb", "snps,dwc2";
197197
reg = <0x10180000 0x40000>;
198198
interrupts = <18>;
199199
clocks = <&usb_otg_ahb_clk>;
200200
clock-names = "otg";
201201
phys = <&usbphy>;
202202
phy-names = "usb2-phy";
203-
};
203+
};
204204
205205
...

Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@ examples:
8787
#size-cells = <0>;
8888
8989
typec-mux@42 {
90-
compatible = "fcs,fsa4480";
91-
reg = <0x42>;
90+
compatible = "fcs,fsa4480";
91+
reg = <0x42>;
9292
93-
interrupts-extended = <&tlmm 2 IRQ_TYPE_LEVEL_LOW>;
93+
interrupts-extended = <&tlmm 2 IRQ_TYPE_LEVEL_LOW>;
9494
95-
vcc-supply = <&vreg_bob>;
95+
vcc-supply = <&vreg_bob>;
9696
97-
mode-switch;
98-
orientation-switch;
97+
mode-switch;
98+
orientation-switch;
9999
100-
port {
101-
fsa4480_ept: endpoint {
102-
remote-endpoint = <&typec_controller>;
100+
port {
101+
fsa4480_ept: endpoint {
102+
remote-endpoint = <&typec_controller>;
103+
};
103104
};
104-
};
105105
};
106106
};
107107
...

Documentation/devicetree/bindings/usb/gpio-sbu-mux.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
items:
2121
- enum:
2222
- nxp,cbdtu02043
23+
- onnn,fsusb42
2324
- onnn,fsusb43l10x
2425
- pericom,pi3usb102
2526
- ti,tmuxhs4212

Documentation/devicetree/bindings/usb/intel,keembay-dwc3.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,20 @@ examples:
5858
#define KEEM_BAY_A53_AUX_USB_SUSPEND
5959
6060
usb {
61-
compatible = "intel,keembay-dwc3";
62-
clocks = <&scmi_clk KEEM_BAY_A53_AUX_USB>,
63-
<&scmi_clk KEEM_BAY_A53_AUX_USB_REF>,
64-
<&scmi_clk KEEM_BAY_A53_AUX_USB_ALT_REF>,
65-
<&scmi_clk KEEM_BAY_A53_AUX_USB_SUSPEND>;
66-
clock-names = "async_master", "ref", "alt_ref", "suspend";
67-
ranges;
68-
#address-cells = <1>;
69-
#size-cells = <1>;
70-
71-
usb@34000000 {
72-
compatible = "snps,dwc3";
73-
reg = <0x34000000 0x10000>;
74-
interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
75-
dr_mode = "peripheral";
76-
};
61+
compatible = "intel,keembay-dwc3";
62+
clocks = <&scmi_clk KEEM_BAY_A53_AUX_USB>,
63+
<&scmi_clk KEEM_BAY_A53_AUX_USB_REF>,
64+
<&scmi_clk KEEM_BAY_A53_AUX_USB_ALT_REF>,
65+
<&scmi_clk KEEM_BAY_A53_AUX_USB_SUSPEND>;
66+
clock-names = "async_master", "ref", "alt_ref", "suspend";
67+
ranges;
68+
#address-cells = <1>;
69+
#size-cells = <1>;
70+
71+
usb@34000000 {
72+
compatible = "snps,dwc3";
73+
reg = <0x34000000 0x10000>;
74+
interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
75+
dr_mode = "peripheral";
76+
};
7777
};

Documentation/devicetree/bindings/usb/ite,it5205.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ examples:
5454
#size-cells = <0>;
5555
5656
typec-mux@48 {
57-
compatible = "ite,it5205";
58-
reg = <0x48>;
57+
compatible = "ite,it5205";
58+
reg = <0x48>;
5959
60-
mode-switch;
61-
orientation-switch;
60+
mode-switch;
61+
orientation-switch;
6262
63-
vcc-supply = <&mt6359_vibr_ldo_reg>;
63+
vcc-supply = <&mt6359_vibr_ldo_reg>;
6464
65-
port {
66-
it5205_usbss_sbu: endpoint {
67-
remote-endpoint = <&typec_controller>;
65+
port {
66+
it5205_usbss_sbu: endpoint {
67+
remote-endpoint = <&typec_controller>;
68+
};
6869
};
69-
};
7070
};
7171
};
7272
...

Documentation/devicetree/bindings/usb/maxim,max33359.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ description: Maxim TCPCI Type-C PD controller
1313

1414
properties:
1515
compatible:
16-
enum:
17-
- maxim,max33359
16+
oneOf:
17+
- enum:
18+
- maxim,max33359
19+
- items:
20+
- const: maxim,max77759-tcpci
21+
- const: maxim,max33359
1822

1923
reg:
2024
maxItems: 1
@@ -70,6 +74,7 @@ examples:
7074
PDO_FIXED_DUAL_ROLE)
7175
PDO_FIXED(9000, 2000, 0)>;
7276
sink-bc12-completion-time-ms = <500>;
77+
pd-revision = /bits/ 8 <0x03 0x01 0x01 0x08>;
7378
};
7479
};
7580
};

0 commit comments

Comments
 (0)