From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 22 Mar 2009 20:18:50 +0000 (+0000)
Subject: remove custom phy hardware detection patch - it is no longer necessary
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a706a524cb0509dc3b08598c84cde9d34b1180b2;p=librecmc%2Flibrecmc.git

remove custom phy hardware detection patch - it is no longer necessary

SVN-Revision: 14979
---

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