Skip to content

Commit 0623fdf

Browse files
torvaldstorvalds
committed
Merge tag 'phy-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy updates from Vinod Koul: "Core: - Drop Kishon as maintainer, thanks to him for helping, move to credits and add Neil to help with reviews. - Add new phy_notify_stat to notify phy from controllers during the runtime transitions and usage in samsung phy New hardware support: - Renesas RZ/G3E USB3.0 driver - NXP Support TJA1048/TJA1051 CAN phy - Rockchip support for rk3506 dsi dphy - Qualcomm Glymur QMP PCIe PHY support Updates: - PM support for rcar-gen3-usb2 driver - Samsung HDMI/eDP Transmitter Combo PHY updates - Freescale imx8mq support for alternate reference clock" * tag 'phy-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (40 commits) MAINTAINERS: phy: Add Neil Armstrong as reviewers for phy subsystem MAINTAINERS: phy: Move Kishon Vijay Abraham I to credits phy: fsl-imx8mq-usb: support alternate reference clock dt-bindings: phy: imx8mq-usb: add alternate reference clock phy: rockchip: samsung-hdptx: Prevent Inter-Pair Skew from exceeding the limits phy: rockchip: samsung-hdptx: Reduce ROPLL loop bandwidth phy: rockchip: samsung-hdptx: Fix reported clock rate in high bpc mode phy: ti: gmii-sel: Add a sanity check on the phy_id phy: qcom: qmp-pcie: Add support for Glymur PCIe Gen5x4 PHY phy: qcom-qmp: pcs: Add v8.50 register offsets dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the Glymur QMP PCIe PHY dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Restrict resets per each device phy: freescale: Initialize priv->lock phy: renesas: Remove unneeded semicolons phy: qcom: m31-eusb2: Update init sequence to set PHY_ENABLE phy: qcom: qmp-combo: get the USB3 & DisplayPort lanes mapping from DT dt-bindings: phy: qcom,sc8280xp-qmp-usb43dp-phy: Document lanes mapping when not using in USB-C complex phy: rockchip: naneng-combphy: Fix PCIe L1ss support RK3562 phy: rockchip: naneng-combphy: Fix PCIe L1ss support RK3528 phy: renesas: rcar-gen3-usb2: Add suspend/resume support ...
2 parents feb06d2 + 716311d commit 0623fdf

36 files changed

Lines changed: 1118 additions & 142 deletions

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ D: One of assisting postmasters for vger.kernel.org's lists
1616
S: (ask for current address)
1717
S: Finland
1818

19+
N: Kishon Vijay Abraham I
20+
E: kishon@kernel.org
21+
D: Generic Phy Framework
22+
1923
N: Thomas Abraham
2024
E: thomas.ab@samsung.com
2125
D: Samsung pin controller driver

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,16 @@ properties:
2727
const: 0
2828

2929
clocks:
30-
maxItems: 1
30+
minItems: 1
31+
items:
32+
- description: PHY configuration clock
33+
- description: Alternate PHY reference clock
3134

3235
clock-names:
36+
minItems: 1
3337
items:
3438
- const: phy
39+
- const: alt
3540

3641
power-domains:
3742
maxItems: 1

‎Documentation/devicetree/bindings/phy/mediatek,tphy.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ properties:
8080
- mediatek,mt2712-tphy
8181
- mediatek,mt6893-tphy
8282
- mediatek,mt7629-tphy
83+
- mediatek,mt7981-tphy
8384
- mediatek,mt7986-tphy
8485
- mediatek,mt8183-tphy
8586
- mediatek,mt8186-tphy

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,glymur-qmp-gen5x4-pcie-phy
1920
- qcom,qcs615-qmp-gen3x1-pcie-phy
2021
- qcom,qcs8300-qmp-gen4x2-pcie-phy
2122
- qcom,sa8775p-qmp-gen4x2-pcie-phy
@@ -178,6 +179,7 @@ allOf:
178179
compatible:
179180
contains:
180181
enum:
182+
- qcom,glymur-qmp-gen5x4-pcie-phy
181183
- qcom,sa8775p-qmp-gen4x2-pcie-phy
182184
- qcom,sa8775p-qmp-gen4x4-pcie-phy
183185
- qcom,sc8280xp-qmp-gen3x1-pcie-phy
@@ -213,17 +215,26 @@ allOf:
213215
compatible:
214216
contains:
215217
enum:
218+
- qcom,glymur-qmp-gen5x4-pcie-phy
216219
- qcom,sm8550-qmp-gen4x2-pcie-phy
217220
- qcom,sm8650-qmp-gen4x2-pcie-phy
221+
- qcom,x1e80100-qmp-gen3x2-pcie-phy
218222
- qcom,x1e80100-qmp-gen4x2-pcie-phy
219223
- qcom,x1e80100-qmp-gen4x4-pcie-phy
220224
- qcom,x1e80100-qmp-gen4x8-pcie-phy
225+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
221226
then:
222227
properties:
223228
resets:
224229
minItems: 2
225230
reset-names:
226231
minItems: 2
232+
else:
233+
properties:
234+
resets:
235+
maxItems: 1
236+
reset-names:
237+
maxItems: 1
227238

228239
- if:
229240
properties:

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

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,77 @@ properties:
7878

7979
ports:
8080
$ref: /schemas/graph.yaml#/properties/ports
81+
8182
properties:
8283
port@0:
83-
$ref: /schemas/graph.yaml#/properties/port
84+
$ref: /schemas/graph.yaml#/$defs/port-base
8485
description: Output endpoint of the PHY
86+
unevaluatedProperties: false
87+
88+
properties:
89+
endpoint:
90+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
91+
unevaluatedProperties: false
92+
93+
endpoint@0:
94+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
95+
description: Display Port Output lanes of the PHY when used with static mapping,
96+
The entry index is the DP lanes index, and the number is the PHY
97+
signal in the order RX0, TX0, TX1, RX1.
98+
unevaluatedProperties: false
99+
100+
properties:
101+
# Static lane mappings are mutually exclusive with typec-mux/orientation-mux
102+
data-lanes:
103+
$ref: /schemas/types.yaml#/definitions/uint32-array
104+
minItems: 2
105+
maxItems: 4
106+
oneOf:
107+
- items: # DisplayPort 1 lane, normal orientation
108+
- const: 3
109+
- items: # DisplayPort 1 lane, flipped orientation
110+
- const: 0
111+
- items: # DisplayPort 2 lanes, normal orientation
112+
- const: 3
113+
- const: 2
114+
- items: # DisplayPort 2 lanes, flipped orientation
115+
- const: 0
116+
- const: 1
117+
- items: # DisplayPort 4 lanes, normal orientation
118+
- const: 3
119+
- const: 2
120+
- const: 1
121+
- const: 0
122+
- items: # DisplayPort 4 lanes, flipped orientation
123+
- const: 0
124+
- const: 1
125+
- const: 2
126+
- const: 3
127+
required:
128+
- data-lanes
129+
130+
endpoint@1:
131+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
132+
description: USB Output lanes of the PHY when used with static mapping.
133+
The entry index is the USB3 lane in the order TX then RX, and the
134+
number is the PHY signal in the order RX0, TX0, TX1, RX1.
135+
unevaluatedProperties: false
136+
137+
properties:
138+
# Static lane mappings are mutually exclusive with typec-mux/orientation-mux
139+
data-lanes:
140+
$ref: /schemas/types.yaml#/definitions/uint32-array
141+
minItems: 2
142+
oneOf:
143+
- items: # USB3, normal orientation
144+
- const: 1
145+
- const: 0
146+
- items: # USB3, flipped orientation
147+
- const: 2
148+
- const: 3
149+
150+
required:
151+
- data-lanes
85152

86153
port@1:
87154
$ref: /schemas/graph.yaml#/properties/port

‎Documentation/devicetree/bindings/phy/renesas,rzg3e-usb3-phy.yaml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/renesas,rzg3e-usb3-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas RZ/G3E USB 3.0 PHY
8+
9+
maintainers:
10+
- Biju Das <biju.das.jz@bp.renesas.com>
11+
12+
properties:
13+
compatible:
14+
const: renesas,r9a09g047-usb3-phy
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
items:
21+
- description: APB bus clock
22+
- description: USB 2.0 PHY reference clock
23+
- description: USB 3.0 PHY reference clock
24+
25+
clock-names:
26+
items:
27+
- const: pclk
28+
- const: core
29+
- const: ref_alt_clk_p
30+
31+
power-domains:
32+
maxItems: 1
33+
34+
resets:
35+
maxItems: 1
36+
37+
'#phy-cells':
38+
const: 0
39+
40+
required:
41+
- compatible
42+
- reg
43+
- clocks
44+
- clock-names
45+
- power-domains
46+
- resets
47+
- '#phy-cells'
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
#include <dt-bindings/clock/renesas,r9a09g047-cpg.h>
54+
55+
usb-phy@15870000 {
56+
compatible = "renesas,r9a09g047-usb3-phy";
57+
reg = <0x15870000 0x10000>;
58+
clocks = <&cpg CPG_MOD 0xb0>, <&cpg CPG_CORE 13>, <&cpg CPG_CORE 12>;
59+
clock-names = "pclk", "core", "ref_alt_clk_p";
60+
power-domains = <&cpg>;
61+
resets = <&cpg 0xaa>;
62+
#phy-cells = <0>;
63+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ allOf:
118118
contains:
119119
enum:
120120
- renesas,usb2-phy-r9a09g057
121+
- renesas,usb2-phy-r9a08g045
121122
- renesas,rzg2l-usb2-phy
122123
then:
123124
properties:

‎Documentation/devicetree/bindings/phy/rockchip,px30-dsi-dphy.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- rockchip,px30-dsi-dphy
1919
- rockchip,rk3128-dsi-dphy
2020
- rockchip,rk3368-dsi-dphy
21+
- rockchip,rk3506-dsi-dphy
2122
- rockchip,rk3568-dsi-dphy
2223
- rockchip,rv1126-dsi-dphy
2324

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

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,26 @@ properties:
2323
- enum:
2424
- ti,tcan1042
2525
- ti,tcan1043
26+
- nxp,tja1048
27+
- nxp,tja1051
28+
- nxp,tja1057
2629
- nxp,tjr1443
2730

2831
'#phy-cells':
29-
const: 0
32+
enum: [0, 1]
3033

31-
standby-gpios:
34+
silent-gpios:
3235
description:
33-
gpio node to toggle standby signal on transceiver
36+
gpio node to toggle silent signal on transceiver
3437
maxItems: 1
3538

39+
standby-gpios:
40+
description:
41+
gpio node to toggle standby signal on transceiver. For two Items, item 1
42+
is for stbn1, item 2 is for stbn2.
43+
minItems: 1
44+
maxItems: 2
45+
3646
enable-gpios:
3747
description:
3848
gpio node to toggle enable signal on transceiver
@@ -54,6 +64,59 @@ required:
5464
- compatible
5565
- '#phy-cells'
5666

67+
allOf:
68+
- if:
69+
properties:
70+
compatible:
71+
enum:
72+
- nxp,tjr1443
73+
- ti,tcan1042
74+
- ti,tcan1043
75+
then:
76+
properties:
77+
'#phy-cells':
78+
const: 0
79+
silent-gpios: false
80+
standby-gpios:
81+
maxItems: 1
82+
83+
- if:
84+
properties:
85+
compatible:
86+
contains:
87+
const: nxp,tja1048
88+
then:
89+
properties:
90+
'#phy-cells':
91+
const: 1
92+
enable-gpios: false
93+
silent-gpios: false
94+
standby-gpios:
95+
minItems: 2
96+
97+
- if:
98+
properties:
99+
compatible:
100+
contains:
101+
const: nxp,tja1051
102+
then:
103+
properties:
104+
'#phy-cells':
105+
const: 0
106+
standby-gpios: false
107+
108+
- if:
109+
properties:
110+
compatible:
111+
contains:
112+
const: nxp,tja1057
113+
then:
114+
properties:
115+
'#phy-cells':
116+
const: 0
117+
enable-gpios: false
118+
standby-gpios: false
119+
57120
additionalProperties: false
58121

59122
examples:

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10547,7 +10547,7 @@ F: include/uapi/asm-generic/
1054710547

1054810548
GENERIC PHY FRAMEWORK
1054910549
M: Vinod Koul <vkoul@kernel.org>
10550-
M: Kishon Vijay Abraham I <kishon@kernel.org>
10550+
R: Neil Armstrong <neil.armstrong@linaro.org>
1055110551
L: linux-phy@lists.infradead.org
1055210552
S: Supported
1055310553
Q: https://patchwork.kernel.org/project/linux-phy/list/

0 commit comments

Comments
 (0)