openwrtv3/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch
Gabor Juhos 86a870f06d 2.6.28: refresh patches
SVN-Revision: 13748
2008-12-27 11:22:54 +00:00

26 lines
775 B
Diff

--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -274,6 +274,9 @@ static int mdio_bus_match(struct device
struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv);
+ if (phydrv->detect)
+ return (phydrv->detect(phydev->bus, phydev->addr));
+
return ((phydrv->phy_id & phydrv->phy_id_mask) ==
(phydev->phy_id & phydrv->phy_id_mask));
}
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -356,6 +356,11 @@ struct phy_driver {
u32 features;
u32 flags;
+ /* Called during discovery to test if the
+ * device can attach to the bus, even if
+ * phy id and mask do not match */
+ bool (*detect)(struct mii_bus *bus, int addr);
+
/*
* Called to initialize the PHY,
* including after a reset