Skip to content

Commit 96e9df3

Browse files
committed
Merge tag 'phy-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next
Vinod writes: phy-for-5.15 - Updates: - Yaml conversion for Freescale imx8mq usb phy, TI AM654 SERDES phy, Cadence torrent phy - Updates for Amlogic Meson8b-usb2 phy, Samsung ufs phy - New support: - UFS phy for Qualcomm SM6115 - PCIe & USB/DP phy for Qualcomm sc8180x - USB3 PHY support for Qualcomm IPQ6018 - Renesas USB2.0 PHY for RZ/G2L * tag 'phy-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (45 commits) phy: qcom-qmp: Add support for SM6115 UFS phy dt-bindings: phy: qcom,qmp: Add SM6115 UFS PHY bindings phy: qmp: Provide unique clock names for DP clocks phy: xilinx: zynqmp: skip PHY initialization and PLL lock for USB phy: amlogic: meson8b-usb2: don't log an error on -EPROBE_DEFER phy: amlogic: meson8b-usb2: Power off the PHY by putting it into reset mode phy: phy-mtk-mipi-dsi: convert to devm_platform_ioremap_resource phy: phy-mtk-mipi-dsi: remove dummy assignment of error number phy: phy-mtk-hdmi: convert to devm_platform_ioremap_resource phy: phy-mtk-ufs: use clock bulk to get clocks phy: phy-mtk-tphy: remove error log of ioremap failure phy: phy-mtk-tphy: print error log using child device phy: phy-mtk-tphy: support type switch by pericfg phy: phy-mtk-tphy: use clock bulk to get clocks dt-bindings: phy: mediatek: tphy: support type switch by pericfg phy: cadence-torrent: Check PIPE mode PHY status to be ready for operation phy: cadence-torrent: Add debug information for PHY configuration phy: cadence-torrent: Add separate functions for reusable code phy: cadence-torrent: Add PHY configuration for DP with 100MHz ref clock phy: cadence-torrent: Add PHY registers for DP in array format ...
2 parents c446e40 + 152a810 commit 96e9df3

29 files changed

+2676
-1672
lines changed

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

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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,imx8mq-usb-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX8MQ USB3 PHY binding
8+
9+
maintainers:
10+
- Li Jun <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- fsl,imx8mq-usb-phy
16+
- fsl,imx8mp-usb-phy
17+
18+
reg:
19+
maxItems: 1
20+
21+
"#phy-cells":
22+
const: 0
23+
24+
clocks:
25+
maxItems: 1
26+
27+
clock-names:
28+
items:
29+
- const: phy
30+
31+
vbus-supply:
32+
description:
33+
A phandle to the regulator for USB VBUS.
34+
35+
required:
36+
- compatible
37+
- reg
38+
- "#phy-cells"
39+
- clocks
40+
- clock-names
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/clock/imx8mq-clock.h>
47+
usb3_phy0: phy@381f0040 {
48+
compatible = "fsl,imx8mq-usb-phy";
49+
reg = <0x381f0040 0x40>;
50+
clocks = <&clk IMX8MQ_CLK_USB1_PHY_ROOT>;
51+
clock-names = "phy";
52+
#phy-cells = <0>;
53+
};

Documentation/devicetree/bindings/phy/intel,phy-keembay-usb.yaml renamed to Documentation/devicetree/bindings/phy/intel,keembay-phy-usb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/phy/intel,phy-keembay-usb.yaml#
4+
$id: http://devicetree.org/schemas/phy/intel,keembay-phy-usb.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Intel Keem Bay USB PHY bindings

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description: |
1515
controllers on MediaTek SoCs, includes USB2.0, USB3.0, PCIe and SATA.
1616
1717
Layout differences of banks between T-PHY V1 (mt8173/mt2701) and
18-
T-PHY V2 (mt2712) when works on USB mode:
18+
T-PHY V2 (mt2712) / V3 (mt8195) when works on USB mode:
1919
-----------------------------------
2020
Version 1:
2121
port offset bank
@@ -34,7 +34,7 @@ description: |
3434
u2 port2 0x1800 U2PHY_COM
3535
...
3636
37-
Version 2:
37+
Version 2/3:
3838
port offset bank
3939
u2 port0 0x0000 MISC
4040
0x0100 FMREG
@@ -59,7 +59,8 @@ description: |
5959
6060
SPLLC shared by u3 ports and FMREG shared by u2 ports on V1 are put back
6161
into each port; a new bank MISC for u2 ports and CHIP for u3 ports are
62-
added on V2.
62+
added on V2; the FMREG bank for slew rate calibration is not used anymore
63+
and reserved on V3;
6364
6465
properties:
6566
$nodename:
@@ -79,8 +80,11 @@ properties:
7980
- mediatek,mt2712-tphy
8081
- mediatek,mt7629-tphy
8182
- mediatek,mt8183-tphy
82-
- mediatek,mt8195-tphy
8383
- const: mediatek,generic-tphy-v2
84+
- items:
85+
- enum:
86+
- mediatek,mt8195-tphy
87+
- const: mediatek,generic-tphy-v3
8488
- const: mediatek,mt2701-u3phy
8589
deprecated: true
8690
- const: mediatek,mt2712-u3phy
@@ -91,7 +95,7 @@ properties:
9195
description:
9296
Register shared by multiple ports, exclude port's private register.
9397
It is needed for T-PHY V1, such as mt2701 and mt8173, but not for
94-
T-PHY V2, such as mt2712.
98+
T-PHY V2/V3, such as mt2712.
9599
maxItems: 1
96100

97101
"#address-cells":
@@ -197,6 +201,22 @@ patternProperties:
197201
Specify the flag to enable BC1.2 if support it
198202
type: boolean
199203

204+
mediatek,syscon-type:
205+
$ref: /schemas/types.yaml#/definitions/phandle-array
206+
maxItems: 1
207+
description:
208+
A phandle to syscon used to access the register of type switch,
209+
the field should always be 3 cells long.
210+
items:
211+
items:
212+
- description:
213+
The first cell represents a phandle to syscon
214+
- description:
215+
The second cell represents the register offset
216+
- description:
217+
The third cell represents the index of config segment
218+
enum: [0, 1, 2, 3]
219+
200220
required:
201221
- reg
202222
- "#phy-cells"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
enum:
2020
- qcom,ipq6018-qmp-pcie-phy
21+
- qcom,ipq6018-qmp-usb3-phy
2122
- qcom,ipq8074-qmp-pcie-phy
2223
- qcom,ipq8074-qmp-usb3-phy
2324
- qcom,msm8996-qmp-pcie-phy
@@ -27,13 +28,15 @@ properties:
2728
- qcom,msm8998-qmp-ufs-phy
2829
- qcom,msm8998-qmp-usb3-phy
2930
- qcom,sc7180-qmp-usb3-phy
31+
- qcom,sc8180x-qmp-pcie-phy
3032
- qcom,sc8180x-qmp-ufs-phy
3133
- qcom,sc8180x-qmp-usb3-phy
3234
- qcom,sdm845-qhp-pcie-phy
3335
- qcom,sdm845-qmp-pcie-phy
3436
- qcom,sdm845-qmp-ufs-phy
3537
- qcom,sdm845-qmp-usb3-phy
3638
- qcom,sdm845-qmp-usb3-uni-phy
39+
- qcom,sm6115-qmp-ufs-phy
3740
- qcom,sm8150-qmp-ufs-phy
3841
- qcom,sm8150-qmp-usb3-phy
3942
- qcom,sm8150-qmp-usb3-uni-phy
@@ -326,6 +329,7 @@ allOf:
326329
compatible:
327330
contains:
328331
enum:
332+
- qcom,sc8180x-qmp-pcie-phy
329333
- qcom,sdm845-qhp-pcie-phy
330334
- qcom,sdm845-qmp-pcie-phy
331335
- qcom,sdx55-qmp-pcie-phy

Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
compatible:
1515
enum:
1616
- qcom,sc7180-qmp-usb3-dp-phy
17+
- qcom,sc8180x-qmp-usb3-dp-phy
1718
- qcom,sdm845-qmp-usb3-dp-phy
1819
- qcom,sm8250-qmp-usb3-dp-phy
1920
reg:

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ properties:
3030
- renesas,usb2-phy-r8a77995 # R-Car D3
3131
- const: renesas,rcar-gen3-usb2-phy
3232

33+
- items:
34+
- enum:
35+
- renesas,usb2-phy-r9a07g044 # RZ/G2{L,LC}
36+
- const: renesas,rzg2l-usb2-phy # RZ/G2L family
37+
3338
reg:
3439
maxItems: 1
3540

@@ -91,6 +96,16 @@ required:
9196
- clocks
9297
- '#phy-cells'
9398

99+
allOf:
100+
- if:
101+
properties:
102+
compatible:
103+
contains:
104+
const: renesas,rzg2l-usb2-phy
105+
then:
106+
required:
107+
- resets
108+
94109
additionalProperties: false
95110

96111
examples:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
compatible:
1717
enum:
1818
- samsung,exynos7-ufs-phy
19+
- samsung,exynosautov9-ufs-phy
1920

2021
reg:
2122
maxItems: 1

Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt

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

0 commit comments

Comments
 (0)