Skip to content

Commit

Permalink
Merge branch 'update-cpsw-bindings-for-serdes-phy'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Kicinski committed Mar 11, 2023
2 parents 939a3f2 + bca93b2 commit 494f642
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,18 @@ properties:
description: CPSW port number

phys:
maxItems: 1
description: phandle on phy-gmii-sel PHY
minItems: 1
items:
- description: CPSW MAC's PHY.
- description: Serdes PHY. Serdes PHY is required only if
the Serdes has to be configured in the
Single-Link configuration.

phy-names:
minItems: 1
items:
- const: mac
- const: serdes

label:
description: label associated with this port
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/ti/am65-cpsw-nuss.c
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ static void am65_cpsw_disable_serdes_phy(struct am65_cpsw_common *common)
static int am65_cpsw_init_serdes_phy(struct device *dev, struct device_node *port_np,
struct am65_cpsw_port *port)
{
const char *name = "serdes-phy";
const char *name = "serdes";
struct phy *phy;
int ret;

Expand Down

0 comments on commit 494f642

Please sign in to comment.