Skip to content

Commit 33e591d

Browse files
committed
Merge tag 'phy-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
Pull phy updates from Vinod Koul: "This contains bunch of new device support and one new Sunplus driver along with updates which include another big round of qmp phy conversion. New support: - Qualcomm SC8280XP eDP & DP and USB3 UNI phy (Bjorn Andersson) - Rockchip rk3568 inno dsidphy (Chris Morgan) - ocelot-serdes phy yaml binding (Colin Foster) - Renesas gen2-usb phy yaml binding (Geert Uytterhoeven) - RGMII suport in lan966x driver (Horatiu Vultur) - Qualcomm SM6375 usb snps-femto-v2 bindings (Konrad Dybcio) - Rockchip rk356x csi-dphya (Michael Riesch) - Qualcomm sdm670 usb2 bindings (Richard Acayan) - Sunplus USB2 PHY (Vincent Shih) Updates: - Mediatek hdmi, ufs, tphy and xsphy updates to use bitfield helpers (Chunfeng Yun) - Continued Qualcomm qmp phy driver split and cleanup. More patches are under review and expected that next cycle might see completion of this activity (Dmitry Baryshkov & Johan Hovold) - TI wiz driver support for j7200 10g (Roger Quadros) - Qualcomm femto phy driver support for override params to help with tuning (Sandeep Maheswaram) - SGMII support in TI wiz driver (Siddharth Vadapalli) - dev_err_probe simplification (Yuan Can)" * tag 'phy-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (170 commits) phy: phy-mtk-dp: make array driving_params static const dt-bindings: phy: qcom,qusb2: document sdm670 compatible phy: qcom-qmp-pcie: fix resource mapping for SDM845 QHP PHY phy: rockchip-snps-pcie3: only look for rockchip,pipe-grf on rk3588 phy: tegra: xusb: Enable usb role switch attribute phy: mediatek: fix build warning of FIELD_PREP() phy: qcom-qmp-usb: Use dev_err_probe() to simplify code phy: qcom-qmp-ufs: Use dev_err_probe() to simplify code phy: qcom-qmp-pcie-msm8996: Use dev_err_probe() to simplify code phy: qcom-qmp-combo: Use dev_err_probe() to simplify code phy: qualcomm: call clk_disable_unprepare in the error handling phy: intel: Use dev_err_probe() to simplify code phy: tegra: xusb: Use dev_err_probe() to simplify code phy: qcom-snps: Use dev_err_probe() to simplify code phy: qcom-qusb2: Use dev_err_probe() to simplify code phy: qcom-qmp-pcie: Use dev_err_probe() to simplify code phy: ti: phy-j721e-wiz: fix reference leaks in wiz_probe() phy: mediatek: mipi: remove register access helpers phy: mediatek: mipi: mt8183: use common helper to access registers phy: mediatek: mipi: mt8183: use GENMASK to generate bits mask ...
2 parents 416a2f4 + 9aa0dad commit 33e591d

77 files changed

Lines changed: 5351 additions & 2654 deletions

File tree

Some content is hidden

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

Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ patternProperties:
5454
description:
5555
Clock provider for TI EHRPWM nodes.
5656

57+
"phy@[0-9a-f]+$":
58+
type: object
59+
$ref: /schemas/phy/ti,phy-gmii-sel.yaml#
60+
description:
61+
The phy node corresponding to the ethernet MAC.
62+
5763
required:
5864
- compatible
5965
- reg

Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
patternProperties:
3333
"^pcie-phy@[0-9]+$":
3434
type: object
35+
additionalProperties: false
3536
description: >
3637
PCIe PHY child nodes
3738

Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Cadence DPHY Rx Device Tree Bindings
88

99
maintainers:
10-
- Pratyush Yadav <p.yadav@ti.com>
10+
- Pratyush Yadav <pratyush@kernel.org>
1111

1212
properties:
1313
compatible:

Documentation/devicetree/bindings/phy/cdns,dphy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Cadence DPHY Device Tree Bindings
88

99
maintainers:
10-
- Pratyush Yadav <p.yadav@ti.com>
10+
- Pratyush Yadav <pratyush@kernel.org>
1111

1212
properties:
1313
compatible:

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ patternProperties:
163163
- PHY_TYPE_USB3
164164
- PHY_TYPE_PCIE
165165
- PHY_TYPE_SATA
166+
- PHY_TYPE_SGMII
166167
167168
nvmem-cells:
168169
items:
@@ -218,6 +219,16 @@ patternProperties:
218219
minimum: 1
219220
maximum: 15
220221

222+
mediatek,pre-emphasis:
223+
description:
224+
The level of pre-emphasis which used to widen the eye opening and
225+
boost eye swing, the unit step is about 4.16% increment; e.g. the
226+
level 1 means amplitude increases about 4.16%, the level 2 is about
227+
8.3% etc. (U2 phy)
228+
$ref: /schemas/types.yaml#/definitions/uint32
229+
minimum: 1
230+
maximum: 3
231+
221232
mediatek,bc12:
222233
description:
223234
Specify the flag to enable BC1.2 if support it
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/mscc,vsc7514-serdes.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microsemi Ocelot SerDes muxing
8+
9+
maintainers:
10+
- Alexandre Belloni <alexandre.belloni@bootlin.com>
11+
- UNGLinuxDriver@microchip.com
12+
13+
description: |
14+
On Microsemi Ocelot, there is a handful of registers in HSIO address
15+
space for setting up the SerDes to switch port muxing.
16+
17+
A SerDes X can be "muxed" to work with switch port Y or Z for example.
18+
One specific SerDes can also be used as a PCIe interface.
19+
20+
Hence, a SerDes represents an interface, be it an Ethernet or a PCIe one.
21+
22+
There are two kinds of SerDes: SERDES1G supports 10/100Mbps in
23+
half/full-duplex and 1000Mbps in full-duplex mode while SERDES6G supports
24+
10/100Mbps in half/full-duplex and 1000/2500Mbps in full-duplex mode.
25+
26+
Also, SERDES6G number (aka "macro") 0 is the only interface supporting
27+
QSGMII.
28+
29+
This is a child of the HSIO syscon ("mscc,ocelot-hsio", see
30+
Documentation/devicetree/bindings/mips/mscc.txt) on the Microsemi Ocelot.
31+
32+
properties:
33+
compatible:
34+
enum:
35+
- mscc,vsc7514-serdes
36+
37+
"#phy-cells":
38+
const: 2
39+
description: |
40+
The first number defines the input port to use for a given SerDes macro.
41+
The second defines the macro to use. They are defined in
42+
dt-bindings/phy/phy-ocelot-serdes.h
43+
44+
required:
45+
- compatible
46+
- "#phy-cells"
47+
48+
additionalProperties:
49+
false
50+
51+
examples:
52+
- |
53+
serdes: serdes {
54+
compatible = "mscc,vsc7514-serdes";
55+
#phy-cells = <2>;
56+
};

Documentation/devicetree/bindings/phy/phy-ocelot-serdes.txt

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

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ properties:
1313
compatible:
1414
enum:
1515
- rockchip,px30-usb2phy
16+
- rockchip,rk3128-usb2phy
1617
- rockchip,rk3228-usb2phy
1718
- rockchip,rk3308-usb2phy
1819
- rockchip,rk3328-usb2phy

Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ patternProperties:
7777
connector:
7878
type: object
7979
$ref: /schemas/connector/usb-connector.yaml
80+
unevaluatedProperties: false
81+
8082
properties:
8183
vbus-supply: true
8284

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ properties:
1919
enum:
2020
- qcom,sc7280-edp-phy
2121
- qcom,sc8180x-edp-phy
22+
- qcom,sc8280xp-dp-phy
23+
- qcom,sc8280xp-edp-phy
2224

2325
reg:
2426
items:

0 commit comments

Comments
 (0)