mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:09:53 +02:00
remove custom phy hardware detection patch - it is no longer necessary
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14979 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
1685e6d7f0
commit
779b12086c
@ -1,26 +0,0 @@
|
||||
--- a/drivers/net/phy/mdio_bus.c
|
||||
+++ b/drivers/net/phy/mdio_bus.c
|
||||
@@ -135,6 +135,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
|
||||
@@ -339,6 +339,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
|
@ -1,26 +0,0 @@
|
||||
--- a/drivers/net/phy/mdio_bus.c
|
||||
+++ b/drivers/net/phy/mdio_bus.c
|
||||
@@ -135,6 +135,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
|
||||
@@ -339,6 +339,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
|
@ -1,26 +0,0 @@
|
||||
--- 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
|
Loading…
Reference in New Issue
Block a user