diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-29 21:27:20 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-29 21:30:32 +0200 |
commit | 085c67762ddac7133b47c6e3825d944c41a5e174 (patch) | |
tree | 1a1ea9692ab0a35dbc98a69bbd68bda6957a7270 /target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch | |
parent | ff31cfb8569f87195a20450aa11e3bdcae59e25c (diff) | |
download | upstream-085c67762ddac7133b47c6e3825d944c41a5e174.tar.gz upstream-085c67762ddac7133b47c6e3825d944c41a5e174.tar.bz2 upstream-085c67762ddac7133b47c6e3825d944c41a5e174.zip |
kernel: bump 5.4 to 5.4.143
Manually rebased:
bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
Removed upstreamed:
mvebu/patches-5.4/100-cpufreq-armada-37xx-forbid-cpufreq-for-1.2-GHz-variant.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 4d46461dd8..29a5d22eb5 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2175,6 +2175,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2183,6 +2183,22 @@ static int lan78xx_phy_init(struct lan78 mii_adv_to_linkmode_adv_t(fc, mii_adv); linkmode_or(phydev->advertising, fc, phydev->advertising); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> if (phydev->mdio.dev.of_node) { u32 reg; int len; -@@ -2652,22 +2668,6 @@ static int lan78xx_open(struct net_devic +@@ -2660,22 +2676,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); |