2017-10-29 18:32:10 +00:00
|
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
|
|
|
Subject: generic: add detach callback to struct phy_driver
|
|
|
|
|
|
|
|
|
|
lede-commit: fe61fc2d7d0b3fb348b502f68f98243b3ddf5867
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/phy/phy_device.c | 3 +++
|
|
|
|
|
include/linux/phy.h | 6 ++++++
|
|
|
|
|
2 files changed, 9 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/phy/phy_device.c
|
|
|
|
|
+++ b/drivers/net/phy/phy_device.c
|
kernel: bump 4.14 to 4.14.93
Refresh patches.
Remove upstreamed patches:
- backport/096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch
- pending/510-f2fs-fix-sanity_check_raw_super-on-big-endian-machines.patch
- brcm2708/950-0415-qmi_wwan-apply-SET_DTR-quirk-to-the-SIMCOM-shared-de.patch
Compile-tested: ar71xx, ath79, brcm2708/bcm27{08,10}, octeon, x86/64
Runtime-tested: ar71xx, ath79, brcm2708/bcm27{08,10}, octeon, x86/64
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2019-01-13 19:50:36 +00:00
|
|
|
@@ -1099,6 +1099,9 @@ void phy_detach(struct phy_device *phyde
|
2017-10-29 18:32:10 +00:00
|
|
|
struct module *ndev_owner = dev->dev.parent->driver->owner;
|
|
|
|
|
struct mii_bus *bus;
|
|
|
|
|
|
|
|
|
|
+ if (phydev->drv && phydev->drv->detach)
|
|
|
|
|
+ phydev->drv->detach(phydev);
|
|
|
|
|
+
|
|
|
|
|
if (phydev->sysfs_links) {
|
|
|
|
|
sysfs_remove_link(&dev->dev.kobj, "phydev");
|
|
|
|
|
sysfs_remove_link(&phydev->mdio.dev.kobj, "attached_dev");
|
|
|
|
|
--- a/include/linux/phy.h
|
|
|
|
|
+++ b/include/linux/phy.h
|
|
|
|
|
@@ -559,6 +559,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);
|
|
|
|
|
|
