From 779b12086c0a2542d979d7a18ab128e2843b82dc Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 22 Mar 2009 20:18:50 +0000 Subject: 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 --- .../patches-2.6.26/610-phy_detect.patch | 26 ---------------------- .../patches-2.6.27/610-phy_detect.patch | 26 ---------------------- .../patches-2.6.28/610-phy_detect.patch | 26 ---------------------- 3 files changed, 78 deletions(-) delete mode 100644 target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.28/610-phy_detect.patch (limited to 'target/linux/generic-2.6') 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 fb46bce6e..000000000 --- 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 fb46bce6e..000000000 --- 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 84e6e1f0d..000000000 --- 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 -- cgit v1.2.3