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>
22 lines
836 B
Diff
22 lines
836 B
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 12 Jul 2016 16:45:43 +0100
|
|
Subject: [PATCH] phy: marvell: 88E1111: add flow control support
|
|
|
|
The Marvell PHYs support pause frame advertisments, so we should not be
|
|
masking their support off. Add the necessary flag to the Marvell PHY
|
|
to allow any MAC level pause frame support to be advertised.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
|
|
--- a/drivers/net/phy/marvell.c
|
|
+++ b/drivers/net/phy/marvell.c
|
|
@@ -1530,7 +1530,7 @@ static struct phy_driver marvell_drivers
|
|
.phy_id = MARVELL_PHY_ID_88E1111,
|
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
|
.name = "Marvell 88E1111",
|
|
- .features = PHY_GBIT_FEATURES,
|
|
+ .features = PHY_GBIT_FEATURES | SUPPORTED_Pause,
|
|
.flags = PHY_HAS_INTERRUPT,
|
|
.probe = marvell_probe,
|
|
.config_init = &m88e1111_config_init,
|