netdev/phy/of: Add more methods for binding PHY devices to drivers. (a30e2c18) · Commits · 戴 / test

Allow PHY drivers to supply their own device matching function (match_phy_device()), or to be matched OF compatible properties. PHYs following IEEE802.3 clause 45 have more than one device identifier constants, which breaks the default device matching code. Other 10G PHYs don't follow the standard manufacturer/device identifier register layout standards, but they do use the standard MDIO bus protocols for register access. Both of these require adjustments to the PHY driver to device matching code. If the there is an of_node associated with such a PHY, we can match it to its driver using the "compatible" properties, just as we do with certain platform devices. If the "compatible" property match fails, first check if there is a driver supplied matching function, and if not fall back to the existing identifier matching rules. Signed-off-by:

David Daney <david.daney@cavium.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/mdio_bus.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include <linux/init.h>
		#include <linux/delay.h>
		#include <linux/device.h>
		#include <linux/of_device.h>
		#include <linux/netdevice.h>
		#include <linux/etherdevice.h>
		#include <linux/skbuff.h>
		@@ -308,6 +309,12 @@ static int mdio_bus_match(struct device dev, struct device_driver drv)
		struct phy_device *phydev = to_phy_device(dev);
		struct phy_driver *phydrv = to_phy_driver(drv);

		if (of_driver_match_device(dev, drv))
		return 1;

		if (phydrv->match_phy_device)
		return phydrv->match_phy_device(phydev);

		return ((phydrv->phy_id & phydrv->phy_id_mask) ==
		(phydev->phy_id & phydrv->phy_id_mask));
		}

include/linux/phy.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -426,6 +426,12 @@ struct phy_driver {
		/* Clears up any memory if needed */
		void (remove)(struct phy_device phydev);

		/* Returns true if this is a suitable driver for the given
		* phydev. If NULL, matching is based on phy_id and
		* phy_id_mask.
		*/
		int (match_phy_device)(struct phy_device phydev);

		/* Handles ethtool queries for hardware time stamping. */
		int (ts_info)(struct phy_device phydev, struct ethtool_ts_info *ti);

Admin message