Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18b200e0 authored by Karicheri, Muralidharan's avatar Karicheri, Muralidharan Committed by Greg Kroah-Hartman
Browse files

net: phy: dp83867: allow RGMII_TXID/RGMII_RXID interface types 




[ Upstream commit 34c55cf2fc75f8bf6ba87df321038c064cf2d426 ]

Currently dp83867 driver returns error if phy interface type
PHY_INTERFACE_MODE_RGMII_RXID is used to set the rx only internal
delay. Similarly issue happens for PHY_INTERFACE_MODE_RGMII_TXID.
Fix this by checking also the interface type if a particular delay
value is missing in the phy dt bindings. Also update the DT document
accordingly.

Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1eac347

Documentation/devicetree/bindings/net/ti,dp83867.txt

+4 −2
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
Required properties:

	- reg - The ID number for the phy, usually a small integer

	- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID

	- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID

	- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h

		for applicable values

drivers/net/phy/dp83867.c

+6 −2
Original line number Diff line number Diff line
@@ -113,12 +113,16 @@ static int dp83867_of_init(struct phy_device *phydev) 


	ret = of_property_read_u32(of_node, "ti,rx-internal-delay",

				   &dp83867->rx_id_delay);

	if (ret)

	if (ret &&

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||

	     phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID))

		return ret;



	ret = of_property_read_u32(of_node, "ti,tx-internal-delay",

				   &dp83867->tx_id_delay);

	if (ret)

	if (ret &&

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||

	     phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID))

		return ret;



	return of_property_read_u32(of_node, "ti,fifo-depth",