Skip to content

Commit 494f642

Browse files
committed
Merge branch 'update-cpsw-bindings-for-serdes-phy'
Siddharth Vadapalli says: ==================== Update CPSW bindings for Serdes PHY This series adds documentation for the Serdes PHY. Also, the name used to refer to the Serdes PHY in the am65-cpsw driver is updated to match the documented name. Documenting the Serdes PHY bindings was missed out in the already merged series at: https://lore.kernel.org/r/20230104103432.1126403-1-s-vadapalli@ti.com/ This miss was pointed out at: https://lore.kernel.org/r/CAMuHMdW5atq-FuLEL3htuE3t2uO86anLL3zeY7n1RqqMP_rH1g@mail.gmail.com/ v2: https://lore.kernel.org/r/20230308051835.276552-1-s-vadapalli@ti.com/ v1: https://lore.kernel.org/r/20230306094750.159657-1-s-vadapalli@ti.com/ ==================== Link: https://lore.kernel.org/r/20230309073612.431287-1-s-vadapalli@ti.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 939a3f2 + bca93b2 commit 494f642

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,18 @@ properties:
126126
description: CPSW port number
127127

128128
phys:
129-
maxItems: 1
130-
description: phandle on phy-gmii-sel PHY
129+
minItems: 1
130+
items:
131+
- description: CPSW MAC's PHY.
132+
- description: Serdes PHY. Serdes PHY is required only if
133+
the Serdes has to be configured in the
134+
Single-Link configuration.
135+
136+
phy-names:
137+
minItems: 1
138+
items:
139+
- const: mac
140+
- const: serdes
131141

132142
label:
133143
description: label associated with this port

drivers/net/ethernet/ti/am65-cpsw-nuss.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,7 @@ static void am65_cpsw_disable_serdes_phy(struct am65_cpsw_common *common)
14661466
static int am65_cpsw_init_serdes_phy(struct device *dev, struct device_node *port_np,
14671467
struct am65_cpsw_port *port)
14681468
{
1469-
const char *name = "serdes-phy";
1469+
const char *name = "serdes";
14701470
struct phy *phy;
14711471
int ret;
14721472

0 commit comments

Comments
 (0)