cd54b2d42b
- Refreshed all patches - Removed upstreamed - Adapted 4 patches: 473-fix-marvell-phy-initialization-issues.patch ----------------------------------------------- Removed hunk 5 which got upstreamed 403-net-phy-avoid-setting-unsupported-EEE-advertisments.patch 404-net-phy-restart-phy-autonegotiation-after-EEE-advert.patch -------------------------------------------------------------- Adapted these 2 RFC patches, merging the delta's from an upstream commit (see below) which made it before these 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux- stable.git/commit/?h=v4.9.36&id=97ace183074d306942b903a148aebd5d061758f0 180-usb-xhci-add-support-for-performing-fake-doorbell.patch ----------------------------------------------------------- - Moved fake_doorbell bitmask due to new item Compile tested on: cns3xxx, imx6 Run tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
27 lines
701 B
Diff
27 lines
701 B
Diff
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -1001,6 +1001,9 @@ void phy_detach(struct phy_device *phyde
|
|
struct mii_bus *bus;
|
|
int i;
|
|
|
|
+ if (phydev->drv && phydev->drv->detach)
|
|
+ phydev->drv->detach(phydev);
|
|
+
|
|
phydev->attached_dev->phydev = NULL;
|
|
phydev->attached_dev = NULL;
|
|
phy_suspend(phydev);
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -517,6 +517,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);
|
|
|