summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-07 15:18:24 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-02-07 15:18:24 +0000
commitf28260a1aa0e20186d49a99384c4d172cb2d2806 (patch)
tree178a049bb4db5f46fce78954d5026edcd4832cfd /target/linux
parentc76ab946eb1bce2f9b5278c38c9d224655488845 (diff)
generic: add detach callback to struct phy_driver
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35510 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch27
-rw-r--r--target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch2
-rw-r--r--target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch27
-rw-r--r--target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch2
-rw-r--r--target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch27
-rw-r--r--target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch2
-rw-r--r--target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch27
-rw-r--r--target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch2
8 files changed, 112 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 000000000..8af9a1916
--- /dev/null
+++ b/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -522,6 +522,9 @@ EXPORT_SYMBOL(phy_attach);
+ */
+ void phy_detach(struct phy_device *phydev)
+ {
++ if (phydev->drv && phydev->drv->detach)
++ phydev->drv->detach(phydev);
++
+ phydev->attached_dev->phydev = NULL;
+ phydev->attached_dev = NULL;
+
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -417,6 +417,12 @@ struct phy_driver {
+ */
+ int (*did_interrupt)(struct phy_device *phydev);
+
++ /*
++ * Called before an ethernet device is detached
++ * from the PHY.
++ */
++ void (*detach)(struct phy_device *phydev);
++
+ /* Clears up any memory if needed */
+ void (*remove)(struct phy_device *phydev);
+
diff --git a/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
index f4c00ca7f..5e4039462 100644
--- a/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
phy_device_free(phydev);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -543,4 +543,22 @@ int __init mdio_bus_init(void);
+@@ -549,4 +549,22 @@ int __init mdio_bus_init(void);
void mdio_bus_exit(void);
extern struct bus_type mdio_bus_type;
diff --git a/target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 000000000..b98f35333
--- /dev/null
+++ b/target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+ */
+ void phy_detach(struct phy_device *phydev)
+ {
++ if (phydev->drv && phydev->drv->detach)
++ phydev->drv->detach(phydev);
++
+ phydev->attached_dev->phydev = NULL;
+ phydev->attached_dev = NULL;
+
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+ */
+ int (*did_interrupt)(struct phy_device *phydev);
+
++ /*
++ * Called before an ethernet device is detached
++ * from the PHY.
++ */
++ void (*detach)(struct phy_device *phydev);
++
+ /* Clears up any memory if needed */
+ void (*remove)(struct phy_device *phydev);
+
diff --git a/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
index db64f5ba9..9ab58af90 100644
--- a/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
phy_device_free(phydev);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
void mdio_bus_exit(void);
extern struct bus_type mdio_bus_type;
diff --git a/target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 000000000..b98f35333
--- /dev/null
+++ b/target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+ */
+ void phy_detach(struct phy_device *phydev)
+ {
++ if (phydev->drv && phydev->drv->detach)
++ phydev->drv->detach(phydev);
++
+ phydev->attached_dev->phydev = NULL;
+ phydev->attached_dev = NULL;
+
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+ */
+ int (*did_interrupt)(struct phy_device *phydev);
+
++ /*
++ * Called before an ethernet device is detached
++ * from the PHY.
++ */
++ void (*detach)(struct phy_device *phydev);
++
+ /* Clears up any memory if needed */
+ void (*remove)(struct phy_device *phydev);
+
diff --git a/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
index a1c5b1d4b..9a68feaca 100644
--- a/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
phy_device_free(phydev);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
void mdio_bus_exit(void);
extern struct bus_type mdio_bus_type;
diff --git a/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644
index 000000000..b98f35333
--- /dev/null
+++ b/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+ */
+ void phy_detach(struct phy_device *phydev)
+ {
++ if (phydev->drv && phydev->drv->detach)
++ phydev->drv->detach(phydev);
++
+ phydev->attached_dev->phydev = NULL;
+ phydev->attached_dev = NULL;
+
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+ */
+ int (*did_interrupt)(struct phy_device *phydev);
+
++ /*
++ * Called before an ethernet device is detached
++ * from the PHY.
++ */
++ void (*detach)(struct phy_device *phydev);
++
+ /* Clears up any memory if needed */
+ void (*remove)(struct phy_device *phydev);
+
diff --git a/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
index a1c5b1d4b..9a68feaca 100644
--- a/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
phy_device_free(phydev);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
void mdio_bus_exit(void);
extern struct bus_type mdio_bus_type;