Skip to content

Commit e63a165

Browse files
committed
Merge tag 'phy-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy updates from Vinod Koul: "A fairly moderate sized request for the generic phy subsystem with some new device and driver support along with driver updates with Samsung and Qualcomm ones being major ones. New HW Support: - Qualcomm X1P42100 PCIe Gen4x4, QCS615 qmp usbc, PCIe UNIPHY 28LP driver, SM8750 QMP UFS PHY - Rockchip rk3576 hdptx, rk3562 naneng-combo support - Samsung MIPI D-/C-PHY driver, ExynosAutov920 ufs phy driver Updates: - Samsung USB3 Type-C lane orientation detection and configuration for Google gs101 - Qualcomm support for dual lane PHY support for QCS8300 SoC" * tag 'phy-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (47 commits) phy: rockchip-naneng-combo: Support rk3562 dt-bindings: phy: rockchip: Add rk3562 naneng-combophy compatible phy: rockchip: Add Samsung MIPI D-/C-PHY driver dt-bindings: phy: Add Rockchip MIPI C-/D-PHY schema phy: qcom: uniphy-28lp: add COMMON_CLK dependency phy: rockchip: usbdp: Remove unnecessary bool conversion phy: rockchip: usbdp: Avoid call hpd_event_trigger in dp_phy_init phy: rockchip: usbdp: Only verify link rates/lanes/voltage when the corresponding set flags are set phy: qcom-qmp-pcie: add dual lane PHY support for QCS8300 dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the QCS8300 QMP PCIe PHY Gen4 x2 phy: qcom-qmp-ufs: Add PHY Configuration support for sm8750 dt-bindings: phy: qcom,sc8280xp-qmp-ufs-phy: document the SM8750 QMP UFS PHY phy: qcom: Introduce PCIe UNIPHY 28LP driver dt-bindings: phy: qcom,uniphy-pcie: Document PCIe uniphy phy: qcom: qmp-usbc: Add qmp configuration for QCS615 phy: freescale: imx8m-pcie: assert phy reset and perst in power off phy: freescale: imx8m-pcie: cleanup reset logic phy: core: Remove unused phy_pm_runtime_(allow|forbid) dt-bindings: phy: document Allwinner A523 USB-2.0 PHY phy: phy-rockchip-samsung-hdptx: Add support for RK3576 ...
2 parents 4d31167 + f13bff2 commit e63a165

Some content is hidden

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

41 files changed

+4430
-270
lines changed

Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ properties:
2020
- allwinner,sun20i-d1-usb-phy
2121
- allwinner,sun50i-a64-usb-phy
2222
- items:
23-
- const: allwinner,sun50i-a100-usb-phy
23+
- enum:
24+
- allwinner,sun50i-a100-usb-phy
25+
- allwinner,sun55i-a523-usb-phy
2426
- const: allwinner,sun20i-d1-usb-phy
2527

2628
reg:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ maintainers:
1212
properties:
1313
compatible:
1414
enum:
15+
- rockchip,rk3562-naneng-combphy
1516
- rockchip,rk3568-naneng-combphy
1617
- rockchip,rk3576-naneng-combphy
1718
- rockchip,rk3588-naneng-combphy
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/qcom,ipq5332-uniphy-pcie-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm UNIPHY PCIe 28LP PHY
8+
9+
maintainers:
10+
- Nitheesh Sekar <[email protected]>
11+
- Varadarajan Narayanan <[email protected]>
12+
13+
description:
14+
PCIe and USB combo PHY found in Qualcomm IPQ5332 SoC
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qcom,ipq5332-uniphy-pcie-phy
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
items:
26+
- description: pcie pipe clock
27+
- description: pcie ahb clock
28+
29+
resets:
30+
items:
31+
- description: phy reset
32+
- description: ahb reset
33+
- description: cfg reset
34+
35+
"#phy-cells":
36+
const: 0
37+
38+
"#clock-cells":
39+
const: 0
40+
41+
num-lanes:
42+
$ref: /schemas/types.yaml#/definitions/uint32
43+
enum: [1, 2]
44+
45+
required:
46+
- compatible
47+
- reg
48+
- clocks
49+
- resets
50+
- "#phy-cells"
51+
- "#clock-cells"
52+
- num-lanes
53+
54+
additionalProperties: false
55+
56+
examples:
57+
- |
58+
#include <dt-bindings/clock/qcom,ipq5332-gcc.h>
59+
60+
pcie0_phy: phy@4b0000 {
61+
compatible = "qcom,ipq5332-uniphy-pcie-phy";
62+
reg = <0x004b0000 0x800>;
63+
64+
clocks = <&gcc GCC_PCIE3X1_0_PIPE_CLK>,
65+
<&gcc GCC_PCIE3X1_PHY_AHB_CLK>;
66+
67+
resets = <&gcc GCC_PCIE3X1_0_PHY_BCR>,
68+
<&gcc GCC_PCIE3X1_PHY_AHB_CLK_ARES>,
69+
<&gcc GCC_PCIE3X1_0_PHY_PHY_BCR>;
70+
71+
#clock-cells = <0>;
72+
73+
#phy-cells = <0>;
74+
75+
num-lanes = <1>;
76+
};

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
compatible:
1818
enum:
1919
- qcom,qcs615-qmp-gen3x1-pcie-phy
20+
- qcom,qcs8300-qmp-gen4x2-pcie-phy
2021
- qcom,sa8775p-qmp-gen4x2-pcie-phy
2122
- qcom,sa8775p-qmp-gen4x4-pcie-phy
2223
- qcom,sar2130p-qmp-gen3x2-pcie-phy
@@ -45,6 +46,7 @@ properties:
4546
- qcom,x1e80100-qmp-gen4x2-pcie-phy
4647
- qcom,x1e80100-qmp-gen4x4-pcie-phy
4748
- qcom,x1e80100-qmp-gen4x8-pcie-phy
49+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
4850

4951
reg:
5052
minItems: 1
@@ -124,6 +126,7 @@ allOf:
124126
enum:
125127
- qcom,sc8280xp-qmp-gen3x4-pcie-phy
126128
- qcom,x1e80100-qmp-gen4x4-pcie-phy
129+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
127130
then:
128131
properties:
129132
reg:
@@ -180,6 +183,7 @@ allOf:
180183
- qcom,x1e80100-qmp-gen4x2-pcie-phy
181184
- qcom,x1e80100-qmp-gen4x4-pcie-phy
182185
- qcom,x1e80100-qmp-gen4x8-pcie-phy
186+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
183187
then:
184188
properties:
185189
clocks:
@@ -192,6 +196,7 @@ allOf:
192196
compatible:
193197
contains:
194198
enum:
199+
- qcom,qcs8300-qmp-gen4x2-pcie-phy
195200
- qcom,sa8775p-qmp-gen4x2-pcie-phy
196201
- qcom,sa8775p-qmp-gen4x4-pcie-phy
197202
then:
@@ -217,12 +222,6 @@ allOf:
217222
minItems: 2
218223
reset-names:
219224
minItems: 2
220-
else:
221-
properties:
222-
resets:
223-
maxItems: 1
224-
reset-names:
225-
maxItems: 1
226225

227226
- if:
228227
properties:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444
- qcom,sm8475-qmp-ufs-phy
4545
- qcom,sm8550-qmp-ufs-phy
4646
- qcom,sm8650-qmp-ufs-phy
47+
- qcom,sm8750-qmp-ufs-phy
4748

4849
reg:
4950
maxItems: 1
@@ -111,6 +112,7 @@ allOf:
111112
- qcom,sm8475-qmp-ufs-phy
112113
- qcom,sm8550-qmp-ufs-phy
113114
- qcom,sm8650-qmp-ufs-phy
115+
- qcom,sm8750-qmp-ufs-phy
114116
then:
115117
properties:
116118
clocks:

Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
enum:
15-
- rockchip,rk3588-hdptx-phy
14+
oneOf:
15+
- enum:
16+
- rockchip,rk3588-hdptx-phy
17+
- items:
18+
- enum:
19+
- rockchip,rk3576-hdptx-phy
20+
- const: rockchip,rk3588-hdptx-phy
1621

1722
reg:
1823
maxItems: 1
@@ -34,24 +39,12 @@ properties:
3439
const: 0
3540

3641
resets:
37-
items:
38-
- description: PHY reset line
39-
- description: APB reset line
40-
- description: INIT reset line
41-
- description: CMN reset line
42-
- description: LANE reset line
43-
- description: ROPLL reset line
44-
- description: LCPLL reset line
42+
minItems: 4
43+
maxItems: 7
4544

4645
reset-names:
47-
items:
48-
- const: phy
49-
- const: apb
50-
- const: init
51-
- const: cmn
52-
- const: lane
53-
- const: ropll
54-
- const: lcpll
46+
minItems: 4
47+
maxItems: 7
5548

5649
rockchip,grf:
5750
$ref: /schemas/types.yaml#/definitions/phandle
@@ -67,6 +60,39 @@ required:
6760
- reset-names
6861
- rockchip,grf
6962

63+
allOf:
64+
- if:
65+
properties:
66+
compatible:
67+
contains:
68+
enum:
69+
- rockchip,rk3576-hdptx-phy
70+
then:
71+
properties:
72+
resets:
73+
minItems: 4
74+
maxItems: 4
75+
reset-names:
76+
items:
77+
- const: apb
78+
- const: init
79+
- const: cmn
80+
- const: lane
81+
else:
82+
properties:
83+
resets:
84+
minItems: 7
85+
maxItems: 7
86+
reset-names:
87+
items:
88+
- const: phy
89+
- const: apb
90+
- const: init
91+
- const: cmn
92+
- const: lane
93+
- const: ropll
94+
- const: lcpll
95+
7096
additionalProperties: false
7197

7298
examples:
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/rockchip,rk3588-mipi-dcphy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip MIPI D-/C-PHY with Samsung IP block
8+
9+
maintainers:
10+
- Guochun Huang <[email protected]>
11+
- Heiko Stuebner <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- rockchip,rk3576-mipi-dcphy
17+
- rockchip,rk3588-mipi-dcphy
18+
19+
reg:
20+
maxItems: 1
21+
22+
"#phy-cells":
23+
const: 1
24+
description: |
25+
Argument is mode to operate in. Supported modes are:
26+
- PHY_TYPE_DPHY
27+
- PHY_TYPE_CPHY
28+
See include/dt-bindings/phy/phy.h for constants.
29+
30+
clocks:
31+
maxItems: 2
32+
33+
clock-names:
34+
items:
35+
- const: pclk
36+
- const: ref
37+
38+
resets:
39+
maxItems: 4
40+
41+
reset-names:
42+
items:
43+
- const: m_phy
44+
- const: apb
45+
- const: grf
46+
- const: s_phy
47+
48+
rockchip,grf:
49+
$ref: /schemas/types.yaml#/definitions/phandle
50+
description:
51+
Phandle to the syscon managing the 'mipi dcphy general register files'.
52+
53+
required:
54+
- compatible
55+
- reg
56+
- clocks
57+
- clock-names
58+
- resets
59+
- reset-names
60+
- "#phy-cells"
61+
62+
additionalProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
67+
#include <dt-bindings/reset/rockchip,rk3588-cru.h>
68+
69+
soc {
70+
#address-cells = <2>;
71+
#size-cells = <2>;
72+
73+
phy@feda0000 {
74+
compatible = "rockchip,rk3588-mipi-dcphy";
75+
reg = <0x0 0xfeda0000 0x0 0x10000>;
76+
clocks = <&cru PCLK_MIPI_DCPHY0>,
77+
<&cru CLK_USBDPPHY_MIPIDCPPHY_REF>;
78+
clock-names = "pclk", "ref";
79+
resets = <&cru SRST_M_MIPI_DCPHY0>,
80+
<&cru SRST_P_MIPI_DCPHY0>,
81+
<&cru SRST_P_MIPI_DCPHY0_GRF>,
82+
<&cru SRST_S_MIPI_DCPHY0>;
83+
reset-names = "m_phy", "apb", "grf", "s_phy";
84+
rockchip,grf = <&mipidcphy0_grf>;
85+
#phy-cells = <1>;
86+
};
87+
};

Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- google,gs101-ufs-phy
1919
- samsung,exynos7-ufs-phy
2020
- samsung,exynosautov9-ufs-phy
21+
- samsung,exynosautov920-ufs-phy
2122
- tesla,fsd-ufs-phy
2223

2324
reg:

0 commit comments

Comments
 (0)