diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-03-22 20:18:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-03-22 20:18:50 +0000 |
| commit | a706a524cb0509dc3b08598c84cde9d34b1180b2 (patch) | |
| tree | c1d3195db57cc377c87485c0241f6465c29875f7 | |
| parent | 4917f1430df4cbb086b956d888d3dbd54fe6f92f (diff) | |
| download | master-31e0f0ae-a706a524cb0509dc3b08598c84cde9d34b1180b2.tar.gz master-31e0f0ae-a706a524cb0509dc3b08598c84cde9d34b1180b2.tar.bz2 master-31e0f0ae-a706a524cb0509dc3b08598c84cde9d34b1180b2.zip | |
remove custom phy hardware detection patch - it is no longer necessary
SVN-Revision: 14979
3 files changed, 0 insertions, 78 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch deleted file mode 100644 index fb46bce6ea..0000000000 --- a/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch deleted file mode 100644 index fb46bce6ea..0000000000 --- a/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch deleted file mode 100644 index 84e6e1f0dd..0000000000 --- a/target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch +++ /dev/null @@ -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 |