diff options
| author | Jakub Kicinski <[email protected]> | 2023-03-10 21:25:04 -0800 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-03-10 21:25:04 -0800 |
| commit | 494f642f8cddb49886b6442c9304b30a0c1ec084 (patch) | |
| tree | dd405704b26fef2f85803074c7792b8409d42340 | |
| parent | 939a3f2a76e3216253b0a596b67ce9bd9ff6af51 (diff) | |
| parent | bca93b20c3976ff5ca9fe373cf7acd0277492ae8 (diff) | |
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/[email protected]/
This miss was pointed out at:
https://lore.kernel.org/r/CAMuHMdW5atq-FuLEL3htuE3t2uO86anLL3zeY7n1RqqMP_rH1g@mail.gmail.com/
v2:
https://lore.kernel.org/r/[email protected]/
v1:
https://lore.kernel.org/r/[email protected]/
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
| -rw-r--r-- | Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml | 14 | ||||
| -rw-r--r-- | drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml index 900063411a20..628d63e1eb1f 100644 --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml @@ -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 diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 25996826edab..4cfbc1c2b1c4 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -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; |