a323a7bf2a
SVN-Revision: 10869
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
Index: linux-2.6.23.16/drivers/net/phy/mdio_bus.c
|
|
===================================================================
|
|
--- linux-2.6.23.16.orig/drivers/net/phy/mdio_bus.c 2008-02-11 07:06:32.000000000 +0100
|
|
+++ linux-2.6.23.16/drivers/net/phy/mdio_bus.c 2008-04-20 01:55:46.000000000 +0200
|
|
@@ -131,6 +131,9 @@
|
|
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));
|
|
}
|
|
Index: linux-2.6.23.16/include/linux/phy.h
|
|
===================================================================
|
|
--- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 00:36:18.000000000 +0200
|
|
+++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 01:55:04.000000000 +0200
|
|
@@ -319,6 +319,11 @@
|
|
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 */
|
|
int (*config_init)(struct phy_device *phydev);
|