Skip to content

Commit e79220d

Browse files
committed
Merge tag 'phy-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes: phy: for 5.7 *) Rename and Re-design phy-cadence-dp driver to phy-cadence-torrent driver *) Add new PHY driver for Qualcomm 28nm Hi-Speed USB PHY *) Add new PHY driver for Qualcomm Super Speed PHY in QCS404 *) Add support for Qualcomm PCIe QMP/QHP PHY in SDM845 to phy-qcom-qmp driver *) Add support for Qualcomm UFS PHY in MSM8996 to phy-qcom-qmp driver *) Add support for an additional reference clock in Mediatek phy-mtk-tphy driver *) Add support for configuring tuning parameters in Mediatek phy-mtk-tphy driver *) Add support for GMII PHY in TI K3 AM654x/J721E SoCs to phy-gmii-sel driver *) Add support for USB2 PHY in Amlogic A1 SoC Family to phy-meson-g12a-usb2 driver *) Add support for USB3/USB2/PCIe PHY in Socionext Pro5 SoC to phy-uniphier-usb3ss/phy-uniphier-usb3hs/phy-uniphier-pcie driver respectively *) Add support for QUSB2 PHY in Qualcomm SC7180 in driver *) Convert dt-bindings of Cadence DP, Qualcomm QUSB2 to YAML format Signed-off-by: Kishon Vijay Abraham I <[email protected]> * tag 'phy-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy: (52 commits) phy: qcom-qusb2: Add new overriding tuning parameters in QUSB2 V2 PHY phy: qcom-qusb2: Add support for overriding tuning parameters in QUSB2 V2 PHY dt-bindings: phy: qcom-qusb2: Add support for overriding Phy tuning parameters phy: qcom-qusb2: Add generic QUSB2 V2 PHY support dt-bindings: phy: qcom,qusb2: Add compatibles for QUSB2 V2 phy and SC7180 dt-bindings: phy: qcom,qusb2: Convert QUSB2 phy bindings to yaml phy: rk-inno-usb2: Decrease verbosity of repeating log. phy: amlogic: Add Amlogic A1 USB2 PHY Driver dt-bindings: phy: Add Amlogic A1 USB2 PHY Bindings phy: ti: gmii-sel: add support for am654x/j721e soc dt-bindings: phy: ti: gmii-sel: add support for am654x/j721e soc phy: qualcomm: usb: Add SuperSpeed PHY driver dt-bindings: Add Qualcomm USB SuperSpeed PHY bindings phy: qualcomm: Add Synopsys 28nm Hi-Speed USB PHY driver dt-bindings: phy: Add Qualcomm Synopsys Hi-Speed USB PHY binding dt-bindings: phy: remove qcom-dwc3-usb-phy phy: phy-mtk-tphy: add a new reference clock phy: phy-mtk-tphy: remove unused u3phya_ref clock phy: phy-mtk-tphy: make the ref clock optional phy: phy-mtk-tphy: add a property for internal resistance ...
2 parents f62c193 + 89d7153 commit e79220d

32 files changed

+4119
-836
lines changed

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
compatible:
1515
enum:
1616
- amlogic,meson-g12a-usb2-phy
17+
- amlogic,meson-a1-usb2-phy
1718

1819
reg:
1920
maxItems: 1
@@ -49,6 +50,19 @@ required:
4950
- reset-names
5051
- "#phy-cells"
5152

53+
if:
54+
properties:
55+
compatible:
56+
enum:
57+
- amlogic,meson-a1-usb-ctrl
58+
59+
then:
60+
properties:
61+
power-domains:
62+
maxItems: 1
63+
required:
64+
- power-domains
65+
5266
examples:
5367
- |
5468
phy@36000 {

Documentation/devicetree/bindings/phy/phy-cadence-dp.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/phy/phy-cadence-torrent.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Cadence Torrent SD0801 PHY binding for DisplayPort
8+
9+
description:
10+
This binding describes the Cadence SD0801 PHY (also known as Torrent PHY)
11+
hardware included with the Cadence MHDP DisplayPort controller.
12+
13+
maintainers:
14+
- Swapnil Jakhade <[email protected]>
15+
- Yuti Amonkar <[email protected]>
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- cdns,torrent-phy
21+
- ti,j721e-serdes-10g
22+
23+
'#address-cells':
24+
const: 1
25+
26+
'#size-cells':
27+
const: 0
28+
29+
clocks:
30+
maxItems: 1
31+
description:
32+
PHY reference clock. Must contain an entry in clock-names.
33+
34+
clock-names:
35+
const: refclk
36+
37+
reg:
38+
minItems: 1
39+
maxItems: 2
40+
items:
41+
- description: Offset of the Torrent PHY configuration registers.
42+
- description: Offset of the DPTX PHY configuration registers.
43+
44+
reg-names:
45+
minItems: 1
46+
maxItems: 2
47+
items:
48+
- const: torrent_phy
49+
- const: dptx_phy
50+
51+
resets:
52+
maxItems: 1
53+
description:
54+
Torrent PHY reset.
55+
See Documentation/devicetree/bindings/reset/reset.txt
56+
57+
patternProperties:
58+
'^phy@[0-7]+$':
59+
type: object
60+
description:
61+
Each group of PHY lanes with a single master lane should be represented as a sub-node.
62+
properties:
63+
reg:
64+
description:
65+
The master lane number. This is the lowest numbered lane in the lane group.
66+
67+
resets:
68+
minItems: 1
69+
maxItems: 4
70+
description:
71+
Contains list of resets, one per lane, to get all the link lanes out of reset.
72+
73+
"#phy-cells":
74+
const: 0
75+
76+
cdns,phy-type:
77+
description:
78+
Specifies the type of PHY for which the group of PHY lanes is used.
79+
Refer include/dt-bindings/phy/phy.h. Constants from the header should be used.
80+
allOf:
81+
- $ref: /schemas/types.yaml#/definitions/uint32
82+
- enum: [1, 2, 3, 4, 5, 6]
83+
84+
cdns,num-lanes:
85+
description:
86+
Number of DisplayPort lanes.
87+
allOf:
88+
- $ref: /schemas/types.yaml#/definitions/uint32
89+
- enum: [1, 2, 4]
90+
default: 4
91+
92+
cdns,max-bit-rate:
93+
description:
94+
Maximum DisplayPort link bit rate to use, in Mbps
95+
allOf:
96+
- $ref: /schemas/types.yaml#/definitions/uint32
97+
- enum: [2160, 2430, 2700, 3240, 4320, 5400, 8100]
98+
default: 8100
99+
100+
required:
101+
- reg
102+
- resets
103+
- "#phy-cells"
104+
- cdns,phy-type
105+
106+
additionalProperties: false
107+
108+
required:
109+
- compatible
110+
- "#address-cells"
111+
- "#size-cells"
112+
- clocks
113+
- clock-names
114+
- reg
115+
- reg-names
116+
- resets
117+
118+
additionalProperties: false
119+
120+
examples:
121+
- |
122+
#include <dt-bindings/phy/phy.h>
123+
torrent_phy: torrent-phy@f0fb500000 {
124+
compatible = "cdns,torrent-phy";
125+
reg = <0xf0 0xfb500000 0x0 0x00100000>,
126+
<0xf0 0xfb030a00 0x0 0x00000040>;
127+
reg-names = "torrent_phy", "dptx_phy";
128+
resets = <&phyrst 0>;
129+
clocks = <&ref_clk>;
130+
clock-names = "refclk";
131+
#address-cells = <1>;
132+
#size-cells = <0>;
133+
torrent_phy_dp: phy@0 {
134+
reg = <0>;
135+
resets = <&phyrst 1>, <&phyrst 2>,
136+
<&phyrst 3>, <&phyrst 4>;
137+
#phy-cells = <0>;
138+
cdns,phy-type = <PHY_TYPE_DP>;
139+
cdns,num-lanes = <4>;
140+
cdns,max-bit-rate = <8100>;
141+
};
142+
};
143+
...

Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ Required properties (controller (parent) node):
1313
"mediatek,mt8173-u3phy";
1414
make use of "mediatek,generic-tphy-v1" on mt2701 instead and
1515
"mediatek,generic-tphy-v2" on mt2712 instead.
16-
- clocks : (deprecated, use port's clocks instead) a list of phandle +
17-
clock-specifier pairs, one for each entry in clock-names
18-
- clock-names : (deprecated, use port's one instead) must contain
19-
"u3phya_ref": for reference clock of usb3.0 analog phy.
16+
17+
- #address-cells: the number of cells used to represent physical
18+
base addresses.
19+
- #size-cells: the number of cells used to represent the size of an address.
20+
- ranges: the address mapping relationship to the parent, defined with
21+
- empty value: if optional 'reg' is used.
22+
- non-empty value: if optional 'reg' is not used. should set
23+
the child's base address to 0, the physical address
24+
within parent's address space, and the length of
25+
the address map.
2026

2127
Required nodes : a sub-node is required for each port the controller
2228
provides. Address range information including the usual
@@ -34,12 +40,6 @@ Optional properties (controller (parent) node):
3440

3541
Required properties (port (child) node):
3642
- reg : address and length of the register set for the port.
37-
- clocks : a list of phandle + clock-specifier pairs, one for each
38-
entry in clock-names
39-
- clock-names : must contain
40-
"ref": 48M reference clock for HighSpeed analog phy; and 26M
41-
reference clock for SuperSpeed analog phy, sometimes is
42-
24M, 25M or 27M, depended on platform.
4343
- #phy-cells : should be 1 (See second example)
4444
cell after port phandle is phy type from:
4545
- PHY_TYPE_USB2
@@ -48,10 +48,22 @@ Required properties (port (child) node):
4848
- PHY_TYPE_SATA
4949

5050
Optional properties (PHY_TYPE_USB2 port (child) node):
51+
- clocks : a list of phandle + clock-specifier pairs, one for each
52+
entry in clock-names
53+
- clock-names : may contain
54+
"ref": 48M reference clock for HighSpeed (digital) phy; and 26M
55+
reference clock for SuperSpeed (digital) phy, sometimes is
56+
24M, 25M or 27M, depended on platform.
57+
"da_ref": the reference clock of analog phy, used if the clocks
58+
of analog and digital phys are separated, otherwise uses
59+
"ref" clock only if needed.
60+
5161
- mediatek,eye-src : u32, the value of slew rate calibrate
5262
- mediatek,eye-vrt : u32, the selection of VRT reference voltage
5363
- mediatek,eye-term : u32, the selection of HS_TX TERM reference voltage
5464
- mediatek,bc12 : bool, enable BC12 of u2phy if support it
65+
- mediatek,discth : u32, the selection of disconnect threshold
66+
- mediatek,intr : u32, the selection of internal R (resistance)
5567

5668
Example:
5769

0 commit comments

Comments
 (0)