diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-12-17 14:15:29 +0100 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2018-02-11 23:15:05 +0100 |
| commit | a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6 (patch) | |
| tree | 89f2e50df8b9a2e61cc9a624230f1142058ac494 /target/linux/brcm63xx/patches-4.4/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch | |
| parent | 457e7a160a31d6c8c4bfe0c3e309b30e0d3132f3 (diff) | |
| download | mtk-20170518-a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6.zip mtk-20170518-a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6.tar.gz mtk-20170518-a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6.tar.bz2 | |
brcm63xx: backport latest bcm63xx_enet changes from upstream
No functional changes, just simple cleanups.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.4/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch b/target/linux/brcm63xx/patches-4.4/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch new file mode 100644 index 0000000..6e6f320 --- /dev/null +++ b/target/linux/brcm63xx/patches-4.4/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch @@ -0,0 +1,25 @@ +From 8c61608e5dd2e15575c171ee9cd558ddc3b94962 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jonas.gorski@gmail.com> +Date: Sun, 17 Dec 2017 12:54:30 +0100 +Subject: [PATCH 3/4] bcm63xx_enet: remove pointless mac_id check + +Enabling the ephy clock for mac 1 is harmless, and the actual usage of +the ephy is not restricted to mac 0, so we might as well remove the +check. + +Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +--- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c ++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +@@ -1804,7 +1804,7 @@ static int bcm_enet_probe(struct platfor + priv->tx_chan = pd->tx_chan; + } + +- if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { ++ if (priv->has_phy && !priv->use_external_mii) { + /* using internal PHY, enable clock */ + priv->phy_clk = devm_clk_get(&pdev->dev, "ephy"); + if (IS_ERR(priv->phy_clk)) { |