diff options
| author | David Bauer <mail@david-bauer.net> | 2021-08-19 20:40:29 +0200 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2021-08-24 19:41:47 +0200 |
| commit | 378769b5551714ccaa821b481bfeecbf362f351e (patch) | |
| tree | 68fdc61b2ff165132b30bf325ab1ba13a8e6a5c1 /target/linux/rockchip | |
| parent | 662401d903ae542e9868e572e318d5411ec756a7 (diff) | |
| download | upstream-378769b5551714ccaa821b481bfeecbf362f351e.tar.gz upstream-378769b5551714ccaa821b481bfeecbf362f351e.tar.bz2 upstream-378769b5551714ccaa821b481bfeecbf362f351e.zip | |
kernel: bump 5.4 to 5.4.142
Compile-tested: ath79-generic ipq40xx-generic
Run-tested: ipq40xx-generic
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/rockchip')
| -rw-r--r-- | target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch index 69b5000177..a96661c968 100644 --- a/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> #include <linux/crc32.h> #include <linux/if_vlan.h> #include <linux/uaccess.h> -@@ -4335,6 +4336,22 @@ static void rtl_tally_reset(struct r8152 +@@ -4336,6 +4337,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -4376,6 +4393,8 @@ static void r8152b_init(struct r8152 *tp +@@ -4377,6 +4394,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> } static void r8153_init(struct r8152 *tp) -@@ -4510,6 +4529,8 @@ static void r8153_init(struct r8152 *tp) +@@ -4511,6 +4530,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> } static void r8153b_init(struct r8152 *tp) -@@ -4586,6 +4607,8 @@ static void r8153b_init(struct r8152 *tp +@@ -4587,6 +4608,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ |