Commit 494f642f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 939a3f2a bca93b20

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

+12 −2
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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;