Skip to content

Commit 1d1ba4d

Browse files
committed
Merge tag 'phy-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy updates from Vinod Koul: "The usual bunch of device support and update to drivers. New Support - Qualcomm SM8750 QMP PCIe PHY dual lane support, PMIV0104 eusb2 repeater support, QCS8300 eDP PHY support - Renesas RZ/T2H and RZ/N2H support and updates to driver for that - TI TCAN1051 phy support - Rockchip rk3588 dphy support, RK3528 combphy support Updates: - cadence updates for calibration and polling for ready and enabling of lower resolutions, runtime pm support, - Rockchip: enable U3 otg port - Renesas USXGMII mode support - Qualcomm UFS PHY and PLL regulator load support" * tag 'phy-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (64 commits) phy: rockchip: phy-rockchip-inno-csidphy: add support for rk3588 variant phy: rockchip: phy-rockchip-inno-csidphy: allow for different reset lines phy: rockchip: phy-rockchip-inno-csidphy: allow writes to grf register 0 dt-bindings: phy: rockchip-inno-csi-dphy: add rk3588 variant dt-bindings: phy: rockchip-inno-csi-dphy: make power-domains non-required phy: cadence: cdns-dphy: Enable lower resolutions in dphy phy: renesas: r8a779f0-ether-serdes: add new step added to latest datasheet phy: renesas: r8a779f0-ether-serdes: add USXGMII mode phy: sophgo: Add USB 2.0 PHY driver for Sophgo CV18XX/SG200X dt-bindings: phy: Add Sophgo CV1800 USB phy phy: cadence: cdns-dphy: Update calibration wait time for startup state machine phy: cadence: cdns-dphy: Fix PLL lock and O_CMN_READY polling phy: renesas: rcar-gen3-usb2: Fix ID check logic with VBUS valid dt-bindings: phy: ti,tcan104x-can: Document TI TCAN1051 phy: lynx-28g: check return value when calling lynx_28g_pll_get phy: qcom: m31-eusb2: Fix the error log while enabling clock phy: rockchip: usbdp: Remove redundant ternary operators phy: renesas: rcar-gen3-usb2: Remove redundant ternary operators phy: hisilicon: Remove redundant ternary operators phy: qcom-qmp-ufs: Add PHY and PLL regulator load ...
2 parents 58b65f6 + bdb9789 commit 1d1ba4d

Some content is hidden

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

49 files changed

+1674
-510
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ properties:
7676
description:
7777
Adjust TX de-emphasis attenuation in dB at nominal
7878
3.5dB point as per USB specification
79-
$ref: /schemas/types.yaml#/definitions/uint32
8079
minimum: 0
8180
maximum: 36
8281

Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ maintainers:
1212
properties:
1313
compatible:
1414
enum:
15+
- rockchip,rk3528-naneng-combphy
1516
- rockchip,rk3562-naneng-combphy
1617
- rockchip,rk3568-naneng-combphy
1718
- rockchip,rk3576-naneng-combphy
@@ -45,6 +46,9 @@ properties:
4546
phy-supply:
4647
description: Single PHY regulator
4748

49+
power-domains:
50+
maxItems: 1
51+
4852
rockchip,enable-ssc:
4953
type: boolean
5054
description:
@@ -105,7 +109,9 @@ allOf:
105109
properties:
106110
compatible:
107111
contains:
108-
const: rockchip,rk3588-naneng-combphy
112+
enum:
113+
- rockchip,rk3528-naneng-combphy
114+
- rockchip,rk3588-naneng-combphy
109115
then:
110116
properties:
111117
resets:

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,18 @@ description:
1616

1717
properties:
1818
compatible:
19-
enum:
20-
- qcom,sa8775p-edp-phy
21-
- qcom,sc7280-edp-phy
22-
- qcom,sc8180x-edp-phy
23-
- qcom,sc8280xp-dp-phy
24-
- qcom,sc8280xp-edp-phy
25-
- qcom,x1e80100-dp-phy
19+
oneOf:
20+
- enum:
21+
- qcom,sa8775p-edp-phy
22+
- qcom,sc7280-edp-phy
23+
- qcom,sc8180x-edp-phy
24+
- qcom,sc8280xp-dp-phy
25+
- qcom,sc8280xp-edp-phy
26+
- qcom,x1e80100-dp-phy
27+
- items:
28+
- enum:
29+
- qcom,qcs8300-edp-phy
30+
- const: qcom,sa8775p-edp-phy
2631

2732
reg:
2833
items:

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242
- qcom,sm8550-qmp-gen4x2-pcie-phy
4343
- qcom,sm8650-qmp-gen3x2-pcie-phy
4444
- qcom,sm8650-qmp-gen4x2-pcie-phy
45+
- qcom,sm8750-qmp-gen3x2-pcie-phy
4546
- qcom,x1e80100-qmp-gen3x2-pcie-phy
4647
- qcom,x1e80100-qmp-gen4x2-pcie-phy
4748
- qcom,x1e80100-qmp-gen4x4-pcie-phy
@@ -164,6 +165,7 @@ allOf:
164165
- qcom,sm8550-qmp-gen4x2-pcie-phy
165166
- qcom,sm8650-qmp-gen3x2-pcie-phy
166167
- qcom,sm8650-qmp-gen4x2-pcie-phy
168+
- qcom,sm8750-qmp-gen3x2-pcie-phy
167169
then:
168170
properties:
169171
clocks:

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ properties:
7373
description:
7474
See include/dt-bindings/phy/phy-qcom-qmp.h
7575

76-
orientation-switch:
77-
description:
78-
Flag the PHY as possible handler of USB Type-C orientation switching
79-
type: boolean
76+
mode-switch: true
77+
orientation-switch: true
8078

8179
ports:
8280
$ref: /schemas/graph.yaml#/properties/ports
@@ -106,6 +104,7 @@ required:
106104
- "#phy-cells"
107105

108106
allOf:
107+
- $ref: /schemas/usb/usb-switch.yaml#
109108
- if:
110109
properties:
111110
compatible:

Documentation/devicetree/bindings/phy/qcom,snps-eusb2-repeater.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- const: qcom,pm8550b-eusb2-repeater
2323
- enum:
2424
- qcom,pm8550b-eusb2-repeater
25+
- qcom,pmiv0104-eusb2-repeater
2526
- qcom,smb2360-eusb2-repeater
2627

2728
reg:
@@ -52,6 +53,12 @@ properties:
5253
minimum: 0
5354
maximum: 7
5455

56+
qcom,tune-res-fsdif:
57+
$ref: /schemas/types.yaml#/definitions/uint8
58+
description: FS Differential TX Output Resistance Tuning
59+
minimum: 0
60+
maximum: 7
61+
5562
required:
5663
- compatible
5764
- reg

Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ properties:
4444
- const: renesas,usb2-phy-r9a09g056 # RZ/V2N
4545
- const: renesas,usb2-phy-r9a09g057
4646

47+
- const: renesas,usb2-phy-r9a09g077 # RZ/T2H
48+
49+
- items:
50+
- const: renesas,usb2-phy-r9a09g087 # RZ/N2H
51+
- const: renesas,usb2-phy-r9a09g077
52+
4753
reg:
4854
maxItems: 1
4955

@@ -120,6 +126,17 @@ allOf:
120126
required:
121127
- resets
122128

129+
- if:
130+
properties:
131+
compatible:
132+
contains:
133+
const: renesas,usb2-phy-r9a09g077
134+
then:
135+
properties:
136+
clocks:
137+
minItems: 2
138+
resets: false
139+
123140
additionalProperties: false
124141

125142
examples:

Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- rockchip,rk3326-csi-dphy
2222
- rockchip,rk3368-csi-dphy
2323
- rockchip,rk3568-csi-dphy
24+
- rockchip,rk3588-csi-dphy
2425

2526
reg:
2627
maxItems: 1
@@ -40,11 +41,15 @@ properties:
4041

4142
resets:
4243
items:
43-
- description: exclusive PHY reset line
44+
- description: APB reset line
45+
- description: PHY reset line
46+
minItems: 1
4447

4548
reset-names:
4649
items:
4750
- const: apb
51+
- const: phy
52+
minItems: 1
4853

4954
rockchip,grf:
5055
$ref: /schemas/types.yaml#/definitions/phandle
@@ -57,11 +62,48 @@ required:
5762
- clocks
5863
- clock-names
5964
- '#phy-cells'
60-
- power-domains
6165
- resets
6266
- reset-names
6367
- rockchip,grf
6468

69+
allOf:
70+
- if:
71+
properties:
72+
compatible:
73+
contains:
74+
enum:
75+
- rockchip,px30-csi-dphy
76+
- rockchip,rk1808-csi-dphy
77+
- rockchip,rk3326-csi-dphy
78+
- rockchip,rk3368-csi-dphy
79+
then:
80+
required:
81+
- power-domains
82+
- if:
83+
properties:
84+
compatible:
85+
contains:
86+
enum:
87+
- rockchip,px30-csi-dphy
88+
- rockchip,rk1808-csi-dphy
89+
- rockchip,rk3326-csi-dphy
90+
- rockchip,rk3368-csi-dphy
91+
- rockchip,rk3568-csi-dphy
92+
then:
93+
properties:
94+
resets:
95+
maxItems: 1
96+
97+
reset-names:
98+
maxItems: 1
99+
else:
100+
properties:
101+
resets:
102+
minItems: 2
103+
104+
reset-names:
105+
minItems: 2
106+
65107
additionalProperties: false
66108

67109
examples:
@@ -78,3 +120,22 @@ examples:
78120
reset-names = "apb";
79121
rockchip,grf = <&grf>;
80122
};
123+
- |
124+
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
125+
#include <dt-bindings/reset/rockchip,rk3588-cru.h>
126+
127+
soc {
128+
#address-cells = <2>;
129+
#size-cells = <2>;
130+
131+
phy@fedc0000 {
132+
compatible = "rockchip,rk3588-csi-dphy";
133+
reg = <0x0 0xfedc0000 0x0 0x8000>;
134+
clocks = <&cru PCLK_CSIPHY0>;
135+
clock-names = "pclk";
136+
#phy-cells = <0>;
137+
resets = <&cru SRST_P_CSIPHY0>, <&cru SRST_CSIPHY0>;
138+
reset-names = "apb", "phy";
139+
rockchip,grf = <&csidphy0_grf>;
140+
};
141+
};
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/sophgo,cv1800b-usb2-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Sophgo CV18XX/SG200X USB 2.0 PHY
8+
9+
maintainers:
10+
- Inochi Amaoto <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: sophgo,cv1800b-usb2-phy
15+
16+
reg:
17+
maxItems: 1
18+
19+
"#phy-cells":
20+
const: 0
21+
22+
clocks:
23+
items:
24+
- description: PHY app clock
25+
- description: PHY stb clock
26+
- description: PHY lpm clock
27+
28+
clock-names:
29+
items:
30+
- const: app
31+
- const: stb
32+
- const: lpm
33+
34+
resets:
35+
maxItems: 1
36+
37+
required:
38+
- compatible
39+
- "#phy-cells"
40+
- clocks
41+
- clock-names
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
phy@48 {
48+
compatible = "sophgo,cv1800b-usb2-phy";
49+
reg = <0x48 0x4>;
50+
#phy-cells = <0>;
51+
clocks = <&clk 93>, <&clk 94>, <&clk 95>;
52+
clock-names = "app", "stb", "lpm";
53+
resets = <&rst 58>;
54+
};

Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- items:
1919
- enum:
2020
- microchip,ata6561
21+
- ti,tcan1051
2122
- const: ti,tcan1042
2223
- enum:
2324
- ti,tcan1042

0 commit comments

Comments
 (0)