Skip to content

Commit 59274c7

Browse files
committed
Merge tag 'usb-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB updates from Greg KH: "Here is the big set of USB patches for 5.5-rc1 Lots of little things in here: - typec updates and additions - usb-serial drivers cleanups and fixes - misc USB drivers cleanups and fixes - gadget drivers new features and controllers added - usual xhci additions - other minor changes All of these have been in linux-next with no reported issues" * tag 'usb-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (223 commits) usb: gadget: udc: gr_udc: create debugfs directory under usb root usb: gadget: atmel: create debugfs directory under usb root usb: musb: create debugfs directory under usb root usb: serial: Fix Kconfig indentation usb: misc: Fix Kconfig indentation usb: gadget: Fix Kconfig indentation usb: host: Fix Kconfig indentation usb: dwc3: Fix Kconfig indentation usb: gadget: configfs: Fix missing spin_lock_init() usb-storage: Disable UAS on JMicron SATA enclosure USB: documentation: flags on usb-storage versus UAS USB: uas: heed CAPACITY_HEURISTICS USB: uas: honor flag to avoid CAPACITY16 usb: host: xhci-tegra: Correct phy enable sequence usb-serial: cp201x: support Mark-10 digital force gauge usb: chipidea: imx: pinctrl for HSIC is optional usb: chipidea: imx: refine the error handling for hsic usb: chipidea: imx: change hsic power regulator as optional usb: chipidea: imx: check data->usbmisc_data against NULL before access usb: chipidea: core: change vbus-regulator as optional ...
2 parents d768869 + 91a9f2d commit 59274c7

File tree

141 files changed

+7240
-2850
lines changed

Some content is hidden

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

141 files changed

+7240
-2850
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5114,13 +5114,13 @@
51145114
Flags is a set of characters, each corresponding
51155115
to a common usb-storage quirk flag as follows:
51165116
a = SANE_SENSE (collect more than 18 bytes
5117-
of sense data);
5117+
of sense data, not on uas);
51185118
b = BAD_SENSE (don't collect more than 18
5119-
bytes of sense data);
5119+
bytes of sense data, not on uas);
51205120
c = FIX_CAPACITY (decrease the reported
51215121
device capacity by one sector);
51225122
d = NO_READ_DISC_INFO (don't use
5123-
READ_DISC_INFO command);
5123+
READ_DISC_INFO command, not on uas);
51245124
e = NO_READ_CAPACITY_16 (don't use
51255125
READ_CAPACITY_16 command);
51265126
f = NO_REPORT_OPCODES (don't use report opcodes
@@ -5135,17 +5135,18 @@
51355135
j = NO_REPORT_LUNS (don't use report luns
51365136
command, uas only);
51375137
l = NOT_LOCKABLE (don't try to lock and
5138-
unlock ejectable media);
5138+
unlock ejectable media, not on uas);
51395139
m = MAX_SECTORS_64 (don't transfer more
5140-
than 64 sectors = 32 KB at a time);
5140+
than 64 sectors = 32 KB at a time,
5141+
not on uas);
51415142
n = INITIAL_READ10 (force a retry of the
5142-
initial READ(10) command);
5143+
initial READ(10) command, not on uas);
51435144
o = CAPACITY_OK (accept the capacity
5144-
reported by the device);
5145+
reported by the device, not on uas);
51455146
p = WRITE_CACHE (the device cache is ON
5146-
by default);
5147+
by default, not on uas);
51475148
r = IGNORE_RESIDUE (the device reports
5148-
bogus residue values);
5149+
bogus residue values, not on uas);
51495150
s = SINGLE_LUN (the device has only one
51505151
Logical Unit);
51515152
t = NO_ATA_1X (don't allow ATA(12) and ATA(16)
@@ -5154,7 +5155,8 @@
51545155
w = NO_WP_DETECT (don't test whether the
51555156
medium is write-protected).
51565157
y = ALWAYS_SYNC (issue a SYNCHRONIZE_CACHE
5157-
even if the device claims no cache)
5158+
even if the device claims no cache,
5159+
not on uas)
51585160
Example: quirks=0419:aaf5:rl,0421:0433:rc
51595161

51605162
user_debug= [KNL,ARM]

Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Required Properties:
88
- "renesas,r8a7745-usb-dmac" (RZ/G1E)
99
- "renesas,r8a77470-usb-dmac" (RZ/G1C)
1010
- "renesas,r8a774a1-usb-dmac" (RZ/G2M)
11+
- "renesas,r8a774b1-usb-dmac" (RZ/G2N)
1112
- "renesas,r8a774c0-usb-dmac" (RZ/G2E)
1213
- "renesas,r8a7790-usb-dmac" (R-Car H2)
1314
- "renesas,r8a7791-usb-dmac" (R-Car M2-W)

Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Required properties:
1010
SoC.
1111
"renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1
1212
SoC.
13+
"renesas,usb2-phy-r8a774b1" if the device is a part of an R8A774B1
14+
SoC.
1315
"renesas,usb2-phy-r8a774c0" if the device is a part of an R8A774C0
1416
SoC.
1517
"renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795

Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ need this driver.
88

99
Required properties:
1010
- compatible: "renesas,r8a774a1-usb3-phy" if the device is a part of an R8A774A1
11+
SoC.
12+
"renesas,r8a774b1-usb3-phy" if the device is a part of an R8A774B1
1113
SoC.
1214
"renesas,r8a7795-usb3-phy" if the device is a part of an R8A7795
1315
SoC.

Documentation/devicetree/bindings/usb/renesas,usb3-peri.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/renesas,usb3-peri.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas USB 3.0 Peripheral controller
8+
9+
maintainers:
10+
- Yoshihiro Shimoda <[email protected]>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- enum:
16+
- renesas,r8a774a1-usb3-peri # RZ/G2M
17+
- renesas,r8a774b1-usb3-peri # RZ/G2N
18+
- renesas,r8a774c0-usb3-peri # RZ/G2E
19+
- renesas,r8a7795-usb3-peri # R-Car H3
20+
- renesas,r8a7796-usb3-peri # R-Car M3-W
21+
- renesas,r8a77965-usb3-peri # R-Car M3-N
22+
- renesas,r8a77990-usb3-peri # R-Car E3
23+
- const: renesas,rcar-gen3-usb3-peri
24+
25+
reg:
26+
maxItems: 1
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
clocks:
32+
maxItems: 1
33+
34+
phys:
35+
maxItems: 1
36+
37+
phy-names:
38+
const: usb
39+
40+
power-domains:
41+
maxItems: 1
42+
43+
resets:
44+
maxItems: 1
45+
46+
usb-role-switch:
47+
$ref: /schemas/types.yaml#/definitions/flag
48+
description: Support role switch.
49+
50+
companion:
51+
$ref: /schemas/types.yaml#/definitions/phandle
52+
description: phandle of a companion.
53+
54+
port:
55+
description: |
56+
any connector to the data bus of this controller should be modelled
57+
using the OF graph bindings specified, if the "usb-role-switch"
58+
property is used.
59+
60+
required:
61+
- compatible
62+
- interrupts
63+
- clocks
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
#include <dt-bindings/clock/r8a774c0-cpg-mssr.h>
70+
#include <dt-bindings/interrupt-controller/arm-gic.h>
71+
#include <dt-bindings/power/r8a774c0-sysc.h>
72+
73+
usb3_peri0: usb@ee020000 {
74+
compatible = "renesas,r8a774c0-usb3-peri", "renesas,rcar-gen3-usb3-peri";
75+
reg = <0 0xee020000 0 0x400>;
76+
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
77+
clocks = <&cpg CPG_MOD 328>;
78+
companion = <&xhci0>;
79+
usb-role-switch;
80+
81+
port {
82+
usb3_role_switch: endpoint {
83+
remote-endpoint = <&hd3ss3220_ep>;
84+
};
85+
};
86+
};

Documentation/devicetree/bindings/usb/renesas,usbhs.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/renesas,usbhs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas USBHS (HS-USB) controller
8+
9+
maintainers:
10+
- Yoshihiro Shimoda <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- const: renesas,usbhs-r7s72100 # RZ/A1
17+
- const: renesas,rza1-usbhs
18+
19+
- items:
20+
- const: renesas,usbhs-r7s9210 # RZ/A2
21+
- const: renesas,rza2-usbhs
22+
23+
- items:
24+
- enum:
25+
- renesas,usbhs-r8a7743 # RZ/G1M
26+
- renesas,usbhs-r8a7744 # RZ/G1N
27+
- renesas,usbhs-r8a7745 # RZ/G1E
28+
- renesas,usbhs-r8a77470 # RZ/G1C
29+
- renesas,usbhs-r8a7790 # R-Car H2
30+
- renesas,usbhs-r8a7791 # R-Car M2-W
31+
- renesas,usbhs-r8a7792 # R-Car V2H
32+
- renesas,usbhs-r8a7793 # R-Car M2-N
33+
- renesas,usbhs-r8a7794 # R-Car E2
34+
- const: renesas,rcar-gen2-usbhs
35+
36+
- items:
37+
- enum:
38+
- renesas,usbhs-r8a774a1 # RZ/G2M
39+
- renesas,usbhs-r8a774b1 # RZ/G2N
40+
- renesas,usbhs-r8a774c0 # RZ/G2E
41+
- renesas,usbhs-r8a7795 # R-Car H3
42+
- renesas,usbhs-r8a7796 # R-Car M3-W
43+
- renesas,usbhs-r8a77965 # R-Car M3-N
44+
- renesas,usbhs-r8a77990 # R-Car E3
45+
- renesas,usbhs-r8a77995 # R-Car D3
46+
- const: renesas,rcar-gen3-usbhs
47+
48+
reg:
49+
maxItems: 1
50+
51+
clocks:
52+
minItems: 1
53+
maxItems: 3
54+
items:
55+
- description: USB 2.0 host
56+
- description: USB 2.0 peripheral
57+
- description: USB 2.0 clock selector
58+
59+
interrupts:
60+
maxItems: 1
61+
62+
renesas,buswait:
63+
$ref: /schemas/types.yaml#/definitions/uint32
64+
description: |
65+
Integer to use BUSWAIT register.
66+
67+
renesas,enable-gpio:
68+
description: |
69+
gpio specifier to check GPIO determining if USB function should be
70+
enabled.
71+
72+
phys:
73+
maxItems: 1
74+
items:
75+
- description: phandle + phy specifier pair.
76+
77+
phy-names:
78+
maxItems: 1
79+
items:
80+
- const: usb
81+
82+
dmas:
83+
minItems: 2
84+
maxItems: 4
85+
86+
dma-names:
87+
minItems: 2
88+
maxItems: 4
89+
items:
90+
- const: ch0
91+
- const: ch1
92+
- const: ch2
93+
- const: ch3
94+
95+
dr_mode: true
96+
97+
power-domains:
98+
maxItems: 1
99+
100+
resets:
101+
minItems: 1
102+
maxItems: 2
103+
items:
104+
- description: USB 2.0 host
105+
- description: USB 2.0 peripheral
106+
107+
required:
108+
- compatible
109+
- reg
110+
- clocks
111+
- interrupts
112+
113+
additionalProperties: false
114+
115+
examples:
116+
- |
117+
#include <dt-bindings/clock/r8a7790-cpg-mssr.h>
118+
#include <dt-bindings/interrupt-controller/arm-gic.h>
119+
#include <dt-bindings/power/r8a7790-sysc.h>
120+
121+
usbhs: usb@e6590000 {
122+
compatible = "renesas,usbhs-r8a7790", "renesas,rcar-gen2-usbhs";
123+
reg = <0 0xe6590000 0 0x100>;
124+
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
125+
clocks = <&cpg CPG_MOD 704>;
126+
};

0 commit comments

Comments
 (0)