Skip to content

Commit 8065c0e

Browse files
committed
Merge branch 'yt8531-support'
Frank Sae says: ==================== net: add dts for yt8521 and yt8531s, add driver for yt8531 Add dts for yt8521 and yt8531s, add driver for yt8531. These patches have been verified on our AM335x platform (motherboard) which has one integrated yt8521 and one RGMII interface. It can connect to daughter boards like yt8531s or yt8531 board. v5: - change the compatible of yaml - change the maintainers of yaml from "frank sae" to "Frank Sae" v4: - change default tx delay from 150ps to 1950ps - add compatible for yaml v3: - change default rx delay from 1900ps to 1950ps - moved ytphy_rgmii_clk_delay_config_with_lock from yt8521's patch to yt8531's patch - removed unnecessary checks of phydev->attached_dev->dev_addr v2: - split BIT macro as one patch - split "dts for yt8521/yt8531s ... " patch as two patches - use standard rx-internal-delay-ps and tx-internal-delay-ps, removed motorcomm,sds-tx-amplitude - removed ytphy_parse_dt, ytphy_probe_helper and ytphy_config_init_helper - not store dts arg to yt8521_priv ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 1839058 + 4ac94f7 commit 8065c0e

File tree

5 files changed

+597
-78
lines changed

5 files changed

+597
-78
lines changed
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/motorcomm,yt8xxx.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MotorComm yt8xxx Ethernet PHY
8+
9+
maintainers:
10+
- Frank Sae <[email protected]>
11+
12+
allOf:
13+
- $ref: ethernet-phy.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- ethernet-phy-id4f51.e91a
19+
- ethernet-phy-id4f51.e91b
20+
21+
rx-internal-delay-ps:
22+
description: |
23+
RGMII RX Clock Delay used only when PHY operates in RGMII mode with
24+
internal delay (phy-mode is 'rgmii-id' or 'rgmii-rxid') in pico-seconds.
25+
enum: [ 0, 150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500, 1650,
26+
1800, 1900, 1950, 2050, 2100, 2200, 2250, 2350, 2500, 2650, 2800,
27+
2950, 3100, 3250, 3400, 3550, 3700, 3850, 4000, 4150 ]
28+
default: 1950
29+
30+
tx-internal-delay-ps:
31+
description: |
32+
RGMII TX Clock Delay used only when PHY operates in RGMII mode with
33+
internal delay (phy-mode is 'rgmii-id' or 'rgmii-txid') in pico-seconds.
34+
enum: [ 0, 150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500, 1650, 1800,
35+
1950, 2100, 2250 ]
36+
default: 1950
37+
38+
motorcomm,clk-out-frequency-hz:
39+
description: clock output on clock output pin.
40+
enum: [0, 25000000, 125000000]
41+
default: 0
42+
43+
motorcomm,keep-pll-enabled:
44+
description: |
45+
If set, keep the PLL enabled even if there is no link. Useful if you
46+
want to use the clock output without an ethernet link.
47+
type: boolean
48+
49+
motorcomm,auto-sleep-disabled:
50+
description: |
51+
If set, PHY will not enter sleep mode and close AFE after unplug cable
52+
for a timer.
53+
type: boolean
54+
55+
motorcomm,tx-clk-adj-enabled:
56+
description: |
57+
This configuration is mainly to adapt to VF2 with JH7110 SoC.
58+
Useful if you want to use tx-clk-xxxx-inverted to adj the delay of tx clk.
59+
type: boolean
60+
61+
motorcomm,tx-clk-10-inverted:
62+
description: |
63+
Use original or inverted RGMII Transmit PHY Clock to drive the RGMII
64+
Transmit PHY Clock delay train configuration when speed is 10Mbps.
65+
type: boolean
66+
67+
motorcomm,tx-clk-100-inverted:
68+
description: |
69+
Use original or inverted RGMII Transmit PHY Clock to drive the RGMII
70+
Transmit PHY Clock delay train configuration when speed is 100Mbps.
71+
type: boolean
72+
73+
motorcomm,tx-clk-1000-inverted:
74+
description: |
75+
Use original or inverted RGMII Transmit PHY Clock to drive the RGMII
76+
Transmit PHY Clock delay train configuration when speed is 1000Mbps.
77+
type: boolean
78+
79+
unevaluatedProperties: false
80+
81+
examples:
82+
- |
83+
mdio {
84+
#address-cells = <1>;
85+
#size-cells = <0>;
86+
phy-mode = "rgmii-id";
87+
ethernet-phy@4 {
88+
/* Only needed to make DT lint tools work. Do not copy/paste
89+
* into real DTS files.
90+
*/
91+
compatible = "ethernet-phy-id4f51.e91a";
92+
93+
reg = <4>;
94+
rx-internal-delay-ps = <2100>;
95+
tx-internal-delay-ps = <150>;
96+
motorcomm,clk-out-frequency-hz = <0>;
97+
motorcomm,keep-pll-enabled;
98+
motorcomm,auto-sleep-disabled;
99+
};
100+
};
101+
- |
102+
mdio {
103+
#address-cells = <1>;
104+
#size-cells = <0>;
105+
phy-mode = "rgmii";
106+
ethernet-phy@5 {
107+
/* Only needed to make DT lint tools work. Do not copy/paste
108+
* into real DTS files.
109+
*/
110+
compatible = "ethernet-phy-id4f51.e91a";
111+
112+
reg = <5>;
113+
motorcomm,clk-out-frequency-hz = <125000000>;
114+
motorcomm,keep-pll-enabled;
115+
motorcomm,auto-sleep-disabled;
116+
};
117+
};

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,8 @@ patternProperties:
847847
description: Moortec Semiconductor Ltd.
848848
"^mosaixtech,.*":
849849
description: Mosaix Technologies, Inc.
850+
"^motorcomm,.*":
851+
description: MotorComm, Inc.
850852
"^motorola,.*":
851853
description: Motorola, Inc.
852854
"^moxa,.*":

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14170,6 +14170,7 @@ M: Peter Geis <[email protected]>
1417014170
1417114171
1417214172
S: Maintained
14173+
F: Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml
1417314174
F: drivers/net/phy/motorcomm.c
1417414175

1417514176
MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD

drivers/net/phy/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ config MOTORCOMM_PHY
257257
tristate "Motorcomm PHYs"
258258
help
259259
Enables support for Motorcomm network PHYs.
260-
Currently supports the YT8511, YT8521, YT8531S Gigabit Ethernet PHYs.
260+
Currently supports YT85xx Gigabit Ethernet PHYs.
261261

262262
config NATIONAL_PHY
263263
tristate "National Semiconductor PHYs"

0 commit comments

Comments
 (0)