aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2017-07-12 22:59:03 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-07-15 00:13:05 +0200
commitcd54b2d42b39da8a7704b67c878eaec720df2cc9 (patch)
treec26babb22b0799448018e3fb803d26030624809b /target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch
parent027aea8af790c2741bcdd0f9b861765fcc1e23eb (diff)
downloadupstream-cd54b2d42b39da8a7704b67c878eaec720df2cc9.tar.gz
upstream-cd54b2d42b39da8a7704b67c878eaec720df2cc9.tar.bz2
upstream-cd54b2d42b39da8a7704b67c878eaec720df2cc9.zip
kernel: update kernel 4.9 to 4.9.37
- 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>
Diffstat (limited to 'target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch')
-rw-r--r--target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch
index 6672bbe8a2..baab044777 100644
--- a/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch
+++ b/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -1485,7 +1485,7 @@ int genphy_config_init(struct phy_device
+@@ -1527,7 +1527,7 @@ int genphy_config_init(struct phy_device
return 0;
}
@@ -9,7 +9,7 @@
{
/* Do nothing for now */
return 0;
-@@ -1724,7 +1724,7 @@ static struct phy_driver genphy_driver[]
+@@ -1798,7 +1798,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic PHY",
@@ -18,7 +18,7 @@
.config_init = genphy_config_init,
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
SUPPORTED_AUI | SUPPORTED_FIBRE |
-@@ -1738,7 +1738,7 @@ static struct phy_driver genphy_driver[]
+@@ -1812,7 +1812,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic 10G PHY",