Skip to content

Commit 7afb9d7

Browse files
torvaldstorvalds
committed
Merge tag 'phy-for-6.5_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy updates from Vinod Koul: "New Support: - Debugfs support for phy core and mediatek driver - Hisilicon inno-usb2-phy driver supporting Hi3798MV100 - Qualcomm SGMII SerDes PHY driver, SM6115 & QCM2290 QMP-USB support, SA8775P USB PHY & USB3 UNI support, QUSB2 support for IPQ9574, IPQ9574 USB3 PHY UpdatesL - Sparx5 serdes phy power optimzation - cadence salvo usb properties and updates and torrent DP with PCIe & USB support - Yaml conversion for Broadcom kona USB bindings and MXS USB binding" * tag 'phy-for-6.5_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (67 commits) dt-bindings: phy: brcm,brcmstb-usb-phy: Fix error in "compatible" conditional schema dt-bindings: phy: mixel,mipi-dsi-phy: Remove assigned-clock* properties dt-bindings: phy: intel,combo-phy: restrict node name suffixes dt-bindings: phy: qcom,usb-hs-phy: Add compatible phy: tegra: xusb: check return value of devm_kzalloc() phy: qcom: qmp-combo: fix Display Port PHY configuration for SM8550 phy: qcom: add the SGMII SerDes PHY driver dt-bindings: phy: describe the Qualcomm SGMII PHY phy: qualcomm: fix indentation in Makefile phy: usb: suppress OC condition for 7439b2 phy: usb: Turn off phy when port is in suspend phy: tegra: xusb: Clear the driver reference in usb-phy dev dt-bindings: phy: mxs-usb-phy: add imx8ulp and imx8qm compatible dt-bindings: phy: mxs-usb-phy: convert to DT schema format dt-bindings: phy: qcom,qmp-usb: fix bindings error dt-bindings: phy: qcom,qmp-ufs: fix the sc8180x regs dt-bindings: phy: qcom,qmp-pcie: fix the sc8180x regs phy: mediatek: tphy: add debugfs files phy: core: add debugfs files phy: fsl-imx8mp-usb: add support for phy tuning ...
2 parents 6843306 + a454850 commit 7afb9d7

46 files changed

Lines changed: 3006 additions & 561 deletions

Some content is hidden

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

‎Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ allOf:
115115
compatible:
116116
contains:
117117
enum:
118-
- const: brcm,bcm4908-usb-phy
119-
- const: brcm,brcmstb-usb-phy
118+
- brcm,bcm4908-usb-phy
119+
- brcm,brcmstb-usb-phy
120120
then:
121121
properties:
122122
reg:

‎Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt‎

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

‎Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.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/phy/brcm,kona-usb2-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom Kona family USB 2.0 PHY
8+
9+
maintainers:
10+
- Florian Fainelli <f.fainelli@gmail.com>
11+
12+
properties:
13+
compatible:
14+
const: brcm,kona-usb2-phy
15+
16+
reg:
17+
maxItems: 1
18+
19+
'#phy-cells':
20+
const: 0
21+
22+
required:
23+
- compatible
24+
- reg
25+
- '#phy-cells'
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
usb-phy@3f130000 {
32+
compatible = "brcm,kona-usb2-phy";
33+
reg = <0x3f130000 0x28>;
34+
#phy-cells = <0>;
35+
};
36+
...

‎Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ properties:
3131
"#phy-cells":
3232
const: 0
3333

34+
cdns,usb2-disconnect-threshold-microvolt:
35+
description: The microvolt threshold value utilized for detecting
36+
USB disconnection event.
37+
enum: [575, 610, 645]
38+
default: 575
39+
3440
required:
3541
- compatible
3642
- reg

‎Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,53 @@ properties:
3535
description:
3636
A phandle to the regulator for USB VBUS.
3737

38+
fsl,phy-tx-vref-tune-percent:
39+
description:
40+
Tunes the HS DC level relative to the nominal level
41+
minimum: 94
42+
maximum: 124
43+
44+
fsl,phy-tx-rise-tune-percent:
45+
description:
46+
Adjusts the rise/fall time duration of the HS waveform relative to
47+
its nominal value
48+
minimum: 97
49+
maximum: 103
50+
51+
fsl,phy-tx-preemp-amp-tune-microamp:
52+
description:
53+
Adjust amount of current sourced to DPn and DMn after a J-to-K
54+
or K-to-J transition. Default is 0 (disabled).
55+
minimum: 0
56+
maximum: 1800
57+
58+
fsl,phy-tx-vboost-level-microvolt:
59+
description:
60+
Adjust the boosted transmit launch pk-pk differential amplitude
61+
minimum: 880
62+
maximum: 1120
63+
64+
fsl,phy-comp-dis-tune-percent:
65+
description:
66+
Adjust the voltage level used to detect a disconnect event at the host
67+
relative to the nominal value
68+
minimum: 91
69+
maximum: 115
70+
71+
fsl,phy-pcs-tx-deemph-3p5db-attenuation-db:
72+
description:
73+
Adjust TX de-emphasis attenuation in dB at nominal
74+
3.5dB point as per USB specification
75+
$ref: /schemas/types.yaml#/definitions/uint32
76+
minimum: 0
77+
maximum: 36
78+
79+
fsl,phy-pcs-tx-swing-full-percent:
80+
description:
81+
Scaling of the voltage defined by fsl,phy-tx-vboost-level-microvolt
82+
minimum: 0
83+
maximum: 100
84+
3885
required:
3986
- compatible
4087
- reg

‎Documentation/devicetree/bindings/phy/fsl,mxs-usbphy.yaml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/fsl,mxs-usbphy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale MXS USB Phy Device
8+
9+
maintainers:
10+
- Xu Yang <xu.yang_2@nxp.com>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- enum:
16+
- fsl,imx23-usbphy
17+
- fsl,imx7ulp-usbphy
18+
- fsl,vf610-usbphy
19+
- items:
20+
- enum:
21+
- fsl,imx28-usbphy
22+
- fsl,imx6ul-usbphy
23+
- fsl,imx6sl-usbphy
24+
- fsl,imx6sx-usbphy
25+
- fsl,imx6q-usbphy
26+
- const: fsl,imx23-usbphy
27+
- items:
28+
- const: fsl,imx6sll-usbphy
29+
- const: fsl,imx6ul-usbphy
30+
- const: fsl,imx23-usbphy
31+
- items:
32+
- enum:
33+
- fsl,imx8dxl-usbphy
34+
- fsl,imx8qm-usbphy
35+
- fsl,imx8ulp-usbphy
36+
- const: fsl,imx7ulp-usbphy
37+
38+
reg:
39+
maxItems: 1
40+
41+
interrupts:
42+
maxItems: 1
43+
44+
clocks:
45+
maxItems: 1
46+
47+
'#phy-cells':
48+
const: 0
49+
50+
power-domains:
51+
maxItems: 1
52+
53+
fsl,anatop:
54+
description:
55+
phandle for anatop register, it is only for imx6 SoC series.
56+
$ref: /schemas/types.yaml#/definitions/phandle
57+
58+
phy-3p0-supply:
59+
description:
60+
One of USB PHY's power supply. Can be used to keep a good signal
61+
quality.
62+
63+
fsl,tx-cal-45-dn-ohms:
64+
description:
65+
Resistance (in ohms) of switchable high-speed trimming resistor
66+
connected in parallel with the 45 ohm resistor that terminates
67+
the DN output signal.
68+
minimum: 35
69+
maximum: 54
70+
default: 45
71+
72+
fsl,tx-cal-45-dp-ohms:
73+
description:
74+
Resistance (in ohms) of switchable high-speed trimming resistor
75+
connected in parallel with the 45 ohm resistor that terminates
76+
the DP output signal.
77+
minimum: 35
78+
maximum: 54
79+
default: 45
80+
81+
fsl,tx-d-cal:
82+
description:
83+
Current trimming value (as a percentage) of the 17.78 mA TX
84+
reference current.
85+
$ref: /schemas/types.yaml#/definitions/uint32
86+
minimum: 79
87+
maximum: 119
88+
default: 100
89+
90+
required:
91+
- compatible
92+
- reg
93+
- clocks
94+
95+
allOf:
96+
- if:
97+
properties:
98+
compatible:
99+
oneOf:
100+
- enum:
101+
- fsl,imx6q-usbphy
102+
- fsl,imx6sl-usbphy
103+
- fsl,imx6sx-usbphy
104+
- fsl,imx6sll-usbphy
105+
- fsl,vf610-usbphy
106+
- items:
107+
- const: fsl,imx6ul-usbphy
108+
- const: fsl,imx23-usbphy
109+
then:
110+
required:
111+
- fsl,anatop
112+
113+
additionalProperties: false
114+
115+
examples:
116+
- |
117+
#include <dt-bindings/interrupt-controller/arm-gic.h>
118+
#include <dt-bindings/clock/imx6qdl-clock.h>
119+
120+
usbphy1: usb-phy@20c9000 {
121+
compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
122+
reg = <0x020c9000 0x1000>;
123+
clocks = <&clks IMX6QDL_CLK_USBPHY1>;
124+
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
125+
fsl,anatop = <&anatop>;
126+
};
127+
128+
...

‎Documentation/devicetree/bindings/phy/intel,combo-phy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description: |
1515
1616
properties:
1717
$nodename:
18-
pattern: "combophy(@.*|-[0-9a-f])*$"
18+
pattern: "combophy(@.*|-([0-9]|[1-9][0-9]+))?$"
1919

2020
compatible:
2121
items:

‎Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ properties:
3232
clock-names:
3333
const: phy_ref
3434

35-
assigned-clocks:
36-
maxItems: 1
37-
38-
assigned-clock-parents:
39-
maxItems: 1
40-
41-
assigned-clock-rates:
42-
maxItems: 1
43-
4435
"#phy-cells":
4536
const: 0
4637

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

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

‎Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ properties:
4343
"#phy-cells":
4444
const: 0
4545

46+
power-domains:
47+
maxItems: 1
48+
4649
vdda-phy-supply: true
4750
vdda-pll-supply: true
4851

0 commit comments

Comments
 (0)