Skip to content

Commit d3dcbe2

Browse files
torvaldstorvalds
committed
Merge tag 'usb-6.1-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 driver changes for 6.1-rc1. Nothing major in here, lots of little things with new devices supported and updates for a few drivers. Highlights include: - thunderbolt/USB4 devices supported a bit better than before, and some new ids to enable new hardware devices - USB gadget uvc updates for newer video formats and better v4l integration (the v4l portions were acked by those maintainers) - typec updates for tiny issues and more typec drivers for new chips. - xhci tiny updates for minor issues - big usb-serial ftdi_sio driver update to handle new devices better - lots of tiny dwc3 fixes and updates for the IP block that is showing up everywhere these days - dts updates for new devices being supported - other tiny janitorial and cleanups fixes for lots of different USB drivers. Full details are in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (169 commits) usb: gadget: uvc: don't put item still in use usb: gadget: uvc: Fix argument to sizeof() in uvc_register_video() usb: host: ehci-exynos: switch to using gpiod API Revert "usb: dwc3: Don't switch OTG -> peripheral if extcon is present" Revert "USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"" dt-bindings: usb: Convert FOTG210 to dt schema usb: mtu3: fix failed runtime suspend in host only mode USB: omap_udc: Fix spelling mistake: "tranceiver_ctrl" -> "transceiver_ctrl" usb: typec: ucsi_ccg: Disable UCSI ALT support on Tegra usb: typec: Replace custom implementation of device_match_fwnode() usb: typec: ucsi: Don't warn on probe deferral usb: add quirks for Lenovo OneLink+ Dock MAINTAINERS: switch dwc3 to Thinh usb: idmouse: fix an uninit-value in idmouse_open USB: PHY: JZ4770: Switch to use dev_err_probe() helper usb: phy: generic: Switch to use dev_err_probe() helper usb: ulpi: use DEFINE_SHOW_ATTRIBUTE to simplify ulpi_regs usb: cdns3: remove dead code usb: cdc-wdm: Use skb_put_data() instead of skb_put/memcpy pair usb: musb: sunxi: Switch to use dev_err_probe() helper ...
2 parents 6181073 + 00988f7 commit d3dcbe2

191 files changed

Lines changed: 4601 additions & 2277 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-thunderbolt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Date: Jan 2020
153153
KernelVersion: 5.5
154154
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
155155
Description: This attribute reports number of RX lanes the device is
156-
using simultaneusly through its upstream port.
156+
using simultaneously through its upstream port.
157157

158158
What: /sys/bus/thunderbolt/devices/.../tx_speed
159159
Date: Jan 2020
@@ -167,7 +167,7 @@ Date: Jan 2020
167167
KernelVersion: 5.5
168168
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
169169
Description: This attribute reports number of TX lanes the device is
170-
using simultaneusly through its upstream port.
170+
using simultaneously through its upstream port.
171171

172172
What: /sys/bus/thunderbolt/devices/.../vendor
173173
Date: Sep 2017

‎Documentation/devicetree/bindings/phy/mxs-usb-phy.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Required properties:
1515
- fsl,anatop: phandle for anatop register, it is only for imx6 SoC series
1616

1717
Optional properties:
18-
- fsl,tx-cal-45-dn-ohms: Integer [30-55]. Resistance (in ohms) of switchable
18+
- fsl,tx-cal-45-dn-ohms: Integer [35-54]. Resistance (in ohms) of switchable
1919
high-speed trimming resistor connected in parallel with the 45 ohm resistor
2020
that terminates the DN output signal. Default: 45
21-
- fsl,tx-cal-45-dp-ohms: Integer [30-55]. Resistance (in ohms) of switchable
21+
- fsl,tx-cal-45-dp-ohms: Integer [35-54]. Resistance (in ohms) of switchable
2222
high-speed trimming resistor connected in parallel with the 45 ohm resistor
2323
that terminates the DP output signal. Default: 45
2424
- fsl,tx-d-cal: Integer [79-119]. Current trimming value (as a percentage) of

‎Documentation/devicetree/bindings/usb/analogix,anx7411.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
connector:
2424
type: object
2525
$ref: ../connector/usb-connector.yaml
26+
unevaluatedProperties: false
27+
2628
description:
2729
Properties for usb c connector.
2830

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ properties:
6767

6868
vhub-strings:
6969
type: object
70+
additionalProperties: false
7071

7172
properties:
7273
'#address-cells':
@@ -78,6 +79,7 @@ properties:
7879
patternProperties:
7980
'^string@[0-9a-f]+$':
8081
type: object
82+
additionalProperties: false
8183
description: string descriptors of the specific language
8284

8385
properties:

‎Documentation/devicetree/bindings/usb/dwc2.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- enum:
3333
- rockchip,px30-usb
3434
- rockchip,rk3036-usb
35+
- rockchip,rk3128-usb
3536
- rockchip,rk3188-usb
3637
- rockchip,rk3228-usb
3738
- rockchip,rk3288-usb

‎Documentation/devicetree/bindings/usb/faraday,fotg210.txt‎

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

‎Documentation/devicetree/bindings/usb/faraday,fotg210.yaml‎

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+
# Copyright 2022 Linaro Ltd.
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/usb/faraday,fotg210.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Faraday Technology FOTG210 HS OTG USB 2.0 controller Bindings
9+
10+
maintainers:
11+
- Linus Walleij <linus.walleij@linaro.org>
12+
13+
allOf:
14+
- $ref: usb-drd.yaml#
15+
- $ref: usb-hcd.yaml#
16+
17+
properties:
18+
compatible:
19+
oneOf:
20+
- const: faraday,fotg210
21+
- items:
22+
- const: cortina,gemini-usb
23+
- const: faraday,fotg210
24+
25+
reg:
26+
maxItems: 1
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
clocks:
32+
maxItems: 1
33+
34+
clock-names:
35+
items:
36+
- const: PCLK
37+
38+
resets:
39+
maxItems: 1
40+
41+
syscon:
42+
$ref: /schemas/types.yaml#/definitions/phandle
43+
description: a phandle to the global Gemini system controller on
44+
Gemini systems
45+
46+
dr_mode: true
47+
48+
phys:
49+
maxItems: 1
50+
51+
phy-names:
52+
const: usb2-phy
53+
54+
required:
55+
- compatible
56+
- reg
57+
- interrupts
58+
- clocks
59+
- clock-names
60+
61+
additionalProperties: false
62+
63+
examples:
64+
- |
65+
#include <dt-bindings/interrupt-controller/irq.h>
66+
#include <dt-bindings/clock/cortina,gemini-clock.h>
67+
#include <dt-bindings/reset/cortina,gemini-reset.h>
68+
usb0: usb@68000000 {
69+
compatible = "cortina,gemini-usb", "faraday,fotg210";
70+
reg = <0x68000000 0x1000>;
71+
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
72+
resets = <&syscon GEMINI_RESET_USB0>;
73+
clocks = <&syscon GEMINI_CLK_GATE_USB0>;
74+
clock-names = "PCLK";
75+
syscon = <&syscon>;
76+
dr_mode = "host";
77+
};

‎Documentation/devicetree/bindings/usb/mediatek,mt6370-tcpc.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/usb/mediatek,mt6370-tcpc.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: MediatTek MT6370 Type-C Port Switch and Power Delivery controller
8+
9+
maintainers:
10+
- ChiYuan Huang <cy_huang@richtek.com>
11+
12+
description: |
13+
MediaTek MT6370 is a multi-functional device.
14+
It integrates charger, ADC, flash, RGB indicators,
15+
regulators (DSV/VIBLDO), and TypeC Port Switch with Power Delivery controller.
16+
This document only describes MT6370 Type-C Port Switch and
17+
Power Delivery controller.
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- mediatek,mt6370-tcpc
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
connector:
28+
type: object
29+
$ref: /schemas/connector/usb-connector.yaml#
30+
unevaluatedProperties: false
31+
32+
additionalProperties: false
33+
34+
required:
35+
- compatible
36+
- interrupts

‎Documentation/devicetree/bindings/usb/npcm7xx-usb.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ EHCI:
55
-----
66

77
Required properties:
8-
- compatible: "nuvoton,npcm750-ehci"
8+
- compatible: should be one of
9+
"nuvoton,npcm750-ehci"
10+
"nuvoton,npcm845-ehci"
911
- interrupts: Should contain the EHCI interrupt
1012
- reg: Physical address and length of the register set for the device
1113

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- qcom,sc7280-dwc3
2727
- qcom,sc8280xp-dwc3
2828
- qcom,sdm660-dwc3
29+
- qcom,sdm670-dwc3
2930
- qcom,sdm845-dwc3
3031
- qcom,sdx55-dwc3
3132
- qcom,sdx65-dwc3
@@ -175,6 +176,7 @@ allOf:
175176
- qcom,msm8998-dwc3
176177
- qcom,sc7180-dwc3
177178
- qcom,sc7280-dwc3
179+
- qcom,sdm670-dwc3
178180
- qcom,sdm845-dwc3
179181
- qcom,sdx55-dwc3
180182
- qcom,sm6350-dwc3
@@ -294,6 +296,7 @@ allOf:
294296
compatible:
295297
contains:
296298
enum:
299+
- qcom,sm6115-dwc3
297300
- qcom,sm6125-dwc3
298301
- qcom,sm8150-dwc3
299302
- qcom,sm8250-dwc3
@@ -344,11 +347,11 @@ allOf:
344347
- qcom,msm8994-dwc3
345348
- qcom,qcs404-dwc3
346349
- qcom,sc7180-dwc3
350+
- qcom,sdm670-dwc3
347351
- qcom,sdm845-dwc3
348352
- qcom,sdx55-dwc3
349353
- qcom,sdx65-dwc3
350354
- qcom,sm4250-dwc3
351-
- qcom,sm6115-dwc3
352355
- qcom,sm6125-dwc3
353356
- qcom,sm6350-dwc3
354357
- qcom,sm8150-dwc3
@@ -380,6 +383,7 @@ allOf:
380383
- qcom,msm8953-dwc3
381384
- qcom,msm8996-dwc3
382385
- qcom,msm8998-dwc3
386+
- qcom,sm6115-dwc3
383387
then:
384388
properties:
385389
interrupts:

0 commit comments

Comments
 (0)