[kernel] refresh generic 2.6.25 patches
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.25 / 610-phy_detect.patch
1 Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
2 ===================================================================
3 --- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
4 +++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
5 @@ -132,6 +132,9 @@ static int mdio_bus_match(struct device
6 struct phy_device *phydev = to_phy_device(dev);
7 struct phy_driver *phydrv = to_phy_driver(drv);
8
9 + if (phydrv->detect)
10 + return (phydrv->detect(phydev->bus, phydev->addr));
11 +
12 return ((phydrv->phy_id & phydrv->phy_id_mask) ==
13 (phydev->phy_id & phydrv->phy_id_mask));
14 }
15 Index: linux-2.6.25.4/include/linux/phy.h
16 ===================================================================
17 --- linux-2.6.25.4.orig/include/linux/phy.h
18 +++ linux-2.6.25.4/include/linux/phy.h
19 @@ -325,6 +325,11 @@ struct phy_driver {
20 u32 features;
21 u32 flags;
22
23 + /* Called during discovery to test if the
24 + * device can attach to the bus, even if
25 + * phy id and mask do not match */
26 + bool (*detect)(struct mii_bus *bus, int addr);
27 +
28 /* Called to initialize the PHY,
29 * including after a reset */
30 int (*config_init)(struct phy_device *phydev);