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-0030-lan78xx-Enable-LEDs-and-auto-negotiation.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-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch index f5567bdade..3b1d4332d6 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2461,6 +2461,11 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2469,6 +2469,11 @@ static int lan78xx_reset(struct lan78xx_ int ret = 0; unsigned long timeout; u8 sig; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_LRST_; -@@ -2514,6 +2519,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2522,6 +2527,9 @@ static int lan78xx_reset(struct lan78xx_ ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_MEF_; @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ret = lan78xx_write_reg(dev, HW_CFG, buf); ret = lan78xx_read_reg(dev, USB_CFG0, &buf); -@@ -2569,6 +2577,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2577,6 +2585,9 @@ static int lan78xx_reset(struct lan78xx_ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; } } |