Skip to content

Commit d12ed2b

Browse files
committed
Merge tag 'phy-for-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy updates from Vinod Koul: "As usual featuring couple of new driver and bunch of new device support and some driver changes to Freescale, rockchip driver along with couple of yaml binding conversions. New Support: - Qualcomm IPQ5424 qusb2 support, IPQ5018 uniphy-pcie driver - Rockchip usb2 support for RK3562, RK3036 usb2 phy support - Samsung exynos2200 eusb2 phy support and driver refactoring for this support, exynos7870 USBDRD support - Mediatek MT7988 xs-phy support - Broadcom BCM74110 usb phy support - Renesas RZ/V2H(P) usb2 phy support Updates: - Freescale phy rate claculation updates, i.MX95 tuning support - Better error handling for amlogic pcie phy - Rockchip color depth configuration and management support - Yaml binding conversion for RK3399 Type-C and PCIe Phy" * tag 'phy-for-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (77 commits) phy: tegra: p2u: Broaden architecture dependency phy: rockchip: inno-usb2: Add usb2 phy support for rk3562 dt-bindings: phy: rockchip,inno-usb2phy: add rk3562 phy: rockchip: inno-usb2: add phy definition for rk3036 dt-bindings: phy: rockchip,inno-usb2phy: add rk3036 compatible phy: freescale: fsl-samsung-hdmi: Improve LUT search for best clock phy: freescale: fsl-samsung-hdmi: Refactor finding PHY settings phy: freescale: fsl-samsung-hdmi: Rename phy_clk_round_rate phy: renesas: phy-rcar-gen3-usb2: Add USB2.0 PHY support for RZ/V2H(P) phy: renesas: phy-rcar-gen3-usb2: Sort compatible entries by SoC part number dt-bindings: phy: renesas,usb2-phy: Document RZ/V2H(P) SoC dt-bindings: phy: renesas,usb2-phy: Add clock constraint for RZ/G2L family phy: exynos5-usbdrd: support Exynos USBDRD 3.2 4nm controller phy: phy-snps-eusb2: add support for exynos2200 phy: phy-snps-eusb2: refactor reference clock init phy: phy-snps-eusb2: make reset control optional phy: phy-snps-eusb2: make repeater optional phy: phy-snps-eusb2: split phy init code phy: phy-snps-eusb2: refactor constructs names phy: move phy-qcom-snps-eusb2 out of its vendor sub-directory ...
2 parents a479ebb + 0c22287 commit d12ed2b

Some content is hidden

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

54 files changed

+2386
-1033
lines changed

Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- brcm,bcm4908-usb-phy
1919
- brcm,bcm7211-usb-phy
2020
- brcm,bcm7216-usb-phy
21+
- brcm,bcm74110-usb-phy
2122
- brcm,brcmstb-usb-phy
2223

2324
reg:
@@ -139,7 +140,9 @@ allOf:
139140
properties:
140141
compatible:
141142
contains:
142-
const: brcm,bcm7216-usb-phy
143+
enum:
144+
- brcm,bcm7216-usb-phy
145+
- brcm,bcm74110-usb-phy
143146
then:
144147
properties:
145148
reg:

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

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ properties:
4343
fsl,phy-tx-vref-tune-percent:
4444
description:
4545
Tunes the HS DC level relative to the nominal level
46-
minimum: 94
46+
minimum: 90
4747
maximum: 124
4848

4949
fsl,phy-tx-rise-tune-percent:
5050
description:
5151
Adjusts the rise/fall time duration of the HS waveform relative to
5252
its nominal value
53-
minimum: 97
54-
maximum: 103
53+
minimum: 90
54+
maximum: 120
5555

5656
fsl,phy-tx-preemp-amp-tune-microamp:
5757
description:
@@ -63,8 +63,7 @@ properties:
6363
fsl,phy-tx-vboost-level-microvolt:
6464
description:
6565
Adjust the boosted transmit launch pk-pk differential amplitude
66-
minimum: 880
67-
maximum: 1120
66+
enum: [844, 1008, 1156]
6867

6968
fsl,phy-comp-dis-tune-percent:
7069
description:
@@ -112,6 +111,34 @@ allOf:
112111
reg:
113112
maxItems: 1
114113

114+
- if:
115+
properties:
116+
compatible:
117+
enum:
118+
- fsl,imx8mq-usb-phy
119+
- fsl,imx8mp-usb-phy
120+
then:
121+
properties:
122+
fsl,phy-tx-vref-tune-percent:
123+
minimum: 94
124+
fsl,phy-tx-rise-tune-percent:
125+
minimum: 97
126+
maximum: 103
127+
128+
- if:
129+
properties:
130+
compatible:
131+
contains:
132+
enum:
133+
- fsl,imx95-usb-phy
134+
then:
135+
properties:
136+
fsl,phy-tx-vref-tune-percent:
137+
maximum: 108
138+
fsl,phy-comp-dis-tune-percent:
139+
minimum: 94
140+
maximum: 104
141+
115142
- if:
116143
required:
117144
- orientation-switch

Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ properties:
3030
- const: mediatek,mt8173-mipi-tx
3131
- items:
3232
- enum:
33+
- mediatek,mt6893-mipi-tx
3334
- mediatek,mt8188-mipi-tx
3435
- mediatek,mt8195-mipi-tx
3536
- mediatek,mt8365-mipi-tx

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ properties:
7878
- items:
7979
- enum:
8080
- mediatek,mt2712-tphy
81+
- mediatek,mt6893-tphy
8182
- mediatek,mt7629-tphy
8283
- mediatek,mt7986-tphy
8384
- mediatek,mt8183-tphy

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ properties:
4949
- enum:
5050
- mediatek,mt3611-xsphy
5151
- mediatek,mt3612-xsphy
52+
- mediatek,mt7988-xsphy
5253
- const: mediatek,xsphy
5354

5455
reg:
@@ -150,6 +151,21 @@ patternProperties:
150151
minimum: 1
151152
maximum: 31
152153

154+
mediatek,syscon-type:
155+
$ref: /schemas/types.yaml#/definitions/phandle-array
156+
description:
157+
A phandle to syscon used to access the register of type switch,
158+
the field should always be 3 cells long.
159+
items:
160+
- items:
161+
- description:
162+
Phandle to phy type configuration system controller
163+
- description:
164+
Phy type configuration register offset
165+
- description:
166+
Index of config segment
167+
enum: [0, 1, 2, 3]
168+
153169
required:
154170
- reg
155171
- clocks

Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ patternProperties:
9999
Specifies the type of PHY for which the group of PHY lanes is used.
100100
Refer include/dt-bindings/phy/phy.h. Constants from the header should be used.
101101
$ref: /schemas/types.yaml#/definitions/uint32
102-
minimum: 1
103-
maximum: 9
102+
enum: [1, 2, 3, 4, 5, 6, 7, 8, 9, 12]
104103

105104
cdns,num-lanes:
106105
description:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ properties:
4242
- const: phy
4343
- const: apb
4444

45+
phy-supply:
46+
description: Single PHY regulator
47+
4548
rockchip,enable-ssc:
4649
type: boolean
4750
description:

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt

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

Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ properties:
4747
- const: pcs_apb
4848
- const: pma_apb
4949

50+
phy-supply:
51+
description: Single PHY regulator
52+
5053
rockchip,dp-lane-mux:
5154
$ref: /schemas/types.yaml#/definitions/uint32-array
5255
minItems: 2

Documentation/devicetree/bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,24 @@ maintainers:
1111
- Varadarajan Narayanan <[email protected]>
1212

1313
description:
14-
PCIe and USB combo PHY found in Qualcomm IPQ5332 SoC
14+
PCIe and USB combo PHY found in Qualcomm IPQ5018 & IPQ5332 SoCs
1515

1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,ipq5018-uniphy-pcie-phy
1920
- qcom,ipq5332-uniphy-pcie-phy
2021

2122
reg:
2223
maxItems: 1
2324

2425
clocks:
25-
items:
26-
- description: pcie pipe clock
27-
- description: pcie ahb clock
26+
minItems: 1
27+
maxItems: 2
2828

2929
resets:
30-
items:
31-
- description: phy reset
32-
- description: ahb reset
33-
- description: cfg reset
30+
minItems: 2
31+
maxItems: 3
3432

3533
"#phy-cells":
3634
const: 0
@@ -53,6 +51,41 @@ required:
5351

5452
additionalProperties: false
5553

54+
allOf:
55+
- if:
56+
properties:
57+
compatible:
58+
contains:
59+
enum:
60+
- qcom,ipq5018-uniphy-pcie-phy
61+
then:
62+
properties:
63+
clocks:
64+
items:
65+
- description: pcie pipe clock
66+
resets:
67+
items:
68+
- description: phy reset
69+
- description: cfg reset
70+
71+
- if:
72+
properties:
73+
compatible:
74+
contains:
75+
enum:
76+
- qcom,ipq5332-uniphy-pcie-phy
77+
then:
78+
properties:
79+
clocks:
80+
items:
81+
- description: pcie pipe clock
82+
- description: pcie ahb clock
83+
resets:
84+
items:
85+
- description: phy reset
86+
- description: ahb reset
87+
- description: cfg reset
88+
5689
examples:
5790
- |
5891
#include <dt-bindings/clock/qcom,ipq5332-gcc.h>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
- enum:
1717
- renesas,usb2-phy-r8a77470 # RZ/G1C
1818
- renesas,usb2-phy-r9a08g045 # RZ/G3S
19+
- renesas,usb2-phy-r9a09g057 # RZ/V2H(P)
1920

2021
- items:
2122
- enum:
@@ -105,8 +106,13 @@ allOf:
105106
properties:
106107
compatible:
107108
contains:
108-
const: renesas,rzg2l-usb2-phy
109+
enum:
110+
- renesas,usb2-phy-r9a09g057
111+
- renesas,rzg2l-usb2-phy
109112
then:
113+
properties:
114+
clocks:
115+
minItems: 2
110116
required:
111117
- resets
112118

Documentation/devicetree/bindings/phy/rockchip,inno-usb2phy.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ properties:
1313
compatible:
1414
enum:
1515
- rockchip,px30-usb2phy
16+
- rockchip,rk3036-usb2phy
1617
- rockchip,rk3128-usb2phy
1718
- rockchip,rk3228-usb2phy
1819
- rockchip,rk3308-usb2phy
1920
- rockchip,rk3328-usb2phy
2021
- rockchip,rk3366-usb2phy
2122
- rockchip,rk3399-usb2phy
23+
- rockchip,rk3562-usb2phy
2224
- rockchip,rk3568-usb2phy
2325
- rockchip,rk3576-usb2phy
2426
- rockchip,rk3588-usb2phy
@@ -184,12 +186,14 @@ allOf:
184186
contains:
185187
enum:
186188
- rockchip,px30-usb2phy
189+
- rockchip,rk3036-usb2phy
187190
- rockchip,rk3128-usb2phy
188191
- rockchip,rk3228-usb2phy
189192
- rockchip,rk3308-usb2phy
190193
- rockchip,rk3328-usb2phy
191194
- rockchip,rk3366-usb2phy
192195
- rockchip,rk3399-usb2phy
196+
- rockchip,rk3562-usb2phy
193197
- rockchip,rk3568-usb2phy
194198
- rockchip,rk3588-usb2phy
195199
- rockchip,rv1108-usb2phy

Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ properties:
4646
reset-names:
4747
const: phy
4848

49+
phy-supply:
50+
description: Single PHY regulator
51+
4952
rockchip,phy-grf:
5053
$ref: /schemas/types.yaml#/definitions/phandle
5154
description: phandle to the syscon managing the phy "general register files"

0 commit comments

Comments
 (0)