diff options
author | John Crispin <john@phrozen.org> | 2016-12-25 20:11:34 +0100 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2017-08-05 08:46:36 +0200 |
commit | 74d00a8c3849c1340efd713eb94b786e304c201f (patch) | |
tree | de481743de61c34da96ab5f9dba3af3edcfb8260 /target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch | |
parent | de350550ef648d9728351b986b0516fa29465c45 (diff) | |
download | mtk-20170518-74d00a8c3849c1340efd713eb94b786e304c201f.zip mtk-20170518-74d00a8c3849c1340efd713eb94b786e304c201f.tar.gz mtk-20170518-74d00a8c3849c1340efd713eb94b786e304c201f.tar.bz2 |
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches
* merge debloat patches
* merge Kconfig patches
* merge swconfig patches
* merge hotplug patches
* drop 200-fix_localversion.patch - upstream
* drop 222-arm_zimage_none.patch - unused
* drop 252-mv_cesa_depends.patch - no longer required
* drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused
* drop 661-fq_codel_keep_dropped_stats.patch - outdated
* drop 702-phy_add_aneg_done_function.patch - upstream
* drop 840-rtc7301.patch - unused
* drop 841-rtc_pt7c4338.patch - upstream
* drop 921-use_preinit_as_init.patch - unused
* drop spio-gpio-old and gpio-mmc - unused
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch')
-rw-r--r-- | target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch b/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch new file mode 100644 index 0000000..96fb3da --- /dev/null +++ b/target/linux/generic/backport-4.9/076-v4.11-0001-net-phy-broadcom-Allow-enabling-or-disabling-of-EEE.patch @@ -0,0 +1,87 @@ +From: Florian Fainelli <f.fainelli@gmail.com> +Date: Tue, 22 Nov 2016 11:40:56 -0800 +Subject: [PATCH] net: phy: broadcom: Allow enabling or disabling of EEE + +In preparation for adding support for Wirespeed/downshift, we need to +change bcm_phy_eee_enable() to allow enabling or disabling EEE, so make +the function take an extra enable/disable boolean parameter and rename +it to illustrate it sets EEE, not necessarily just enables it. + +Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + +--- a/drivers/net/phy/bcm7xxx.c ++++ b/drivers/net/phy/bcm7xxx.c +@@ -199,7 +199,7 @@ static int bcm7xxx_28nm_config_init(stru + if (ret) + return ret; + +- ret = bcm_phy_enable_eee(phydev); ++ ret = bcm_phy_set_eee(phydev, true); + if (ret) + return ret; + +--- a/drivers/net/phy/bcm-cygnus.c ++++ b/drivers/net/phy/bcm-cygnus.c +@@ -104,7 +104,7 @@ static int bcm_cygnus_config_init(struct + return rc; + + /* Advertise EEE */ +- rc = bcm_phy_enable_eee(phydev); ++ rc = bcm_phy_set_eee(phydev, true); + if (rc) + return rc; + +--- a/drivers/net/phy/bcm-phy-lib.c ++++ b/drivers/net/phy/bcm-phy-lib.c +@@ -195,7 +195,7 @@ int bcm_phy_enable_apd(struct phy_device + } + EXPORT_SYMBOL_GPL(bcm_phy_enable_apd); + +-int bcm_phy_enable_eee(struct phy_device *phydev) ++int bcm_phy_set_eee(struct phy_device *phydev, bool enable) + { + int val; + +@@ -205,7 +205,10 @@ int bcm_phy_enable_eee(struct phy_device + if (val < 0) + return val; + +- val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X; ++ if (enable) ++ val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X; ++ else ++ val &= ~(LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X); + + phy_write_mmd_indirect(phydev, BRCM_CL45VEN_EEE_CONTROL, + MDIO_MMD_AN, (u32)val); +@@ -216,14 +219,17 @@ int bcm_phy_enable_eee(struct phy_device + if (val < 0) + return val; + +- val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T); ++ if (enable) ++ val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T); ++ else ++ val &= ~(MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T); + + phy_write_mmd_indirect(phydev, BCM_CL45VEN_EEE_ADV, + MDIO_MMD_AN, (u32)val); + + return 0; + } +-EXPORT_SYMBOL_GPL(bcm_phy_enable_eee); ++EXPORT_SYMBOL_GPL(bcm_phy_set_eee); + + MODULE_DESCRIPTION("Broadcom PHY Library"); + MODULE_LICENSE("GPL v2"); +--- a/drivers/net/phy/bcm-phy-lib.h ++++ b/drivers/net/phy/bcm-phy-lib.h +@@ -36,5 +36,5 @@ int bcm_phy_config_intr(struct phy_devic + + int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down); + +-int bcm_phy_enable_eee(struct phy_device *phydev); ++int bcm_phy_set_eee(struct phy_device *phydev, bool enable); + #endif /* _LINUX_BCM_PHY_LIB_H */ |