kernel: bump 5.4 to 5.4.55

Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2020-08-01 02:15:38 +08:00
parent e6b52447eb
commit 0113142456
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 12 additions and 13 deletions

View File

@ -9,12 +9,12 @@ endif
LINUX_VERSION-4.9 = .231
LINUX_VERSION-4.14 = .190
LINUX_VERSION-4.19 = .135
LINUX_VERSION-5.4 = .54
LINUX_VERSION-5.4 = .55
LINUX_KERNEL_HASH-4.9.231 = 4f843ba02fda5217942225afdce020d5f2f9b24f4210bf71a7c4fb63ceece8eb
LINUX_KERNEL_HASH-4.14.190 = 6f175a3793ef0a15ba73be458a642c303be10b0ae387614f4fc1424451ed3f41
LINUX_KERNEL_HASH-4.19.135 = 33d7cecaa6258233881d2a5ecf25d40134639da5b1d497222eb1cbed9e32af98
LINUX_KERNEL_HASH-5.4.54 = 03e2a14e0eace8f4d668b72f82ad0a16f2221a676a22047aaac9ed0453dbf477
LINUX_KERNEL_HASH-5.4.55 = cc0b3fd38e80efdac3d8501b7e4670912f5acf345e0f07c4822210c3de4bf940
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

View File

@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3968,14 +3968,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -3969,14 +3969,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

View File

@ -1,15 +1,14 @@
From: QiuSimons
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -226,6 +226,10 @@
@@ -254,6 +254,10 @@
};
};
+&i2c0 {
+ status = "okay";
+};
+
&io_domains {
status = "okay";

View File

@ -26,7 +26,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -857,6 +857,7 @@
@@ -867,6 +867,7 @@
resets = <&cru SRST_GMAC2IO_A>;
reset-names = "stmmaceth";
rockchip,grf = <&grf>;
@ -34,7 +34,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
status = "disabled";
};
@@ -878,6 +879,7 @@
@@ -888,6 +889,7 @@
reset-names = "stmmaceth", "mac-phy";
phy-mode = "rmii";
phy-handle = <&phy>;

View File

@ -26,7 +26,7 @@ use-case. You've been warned.
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -936,6 +936,33 @@
@@ -948,6 +948,33 @@
status = "disabled";
};

View File

@ -32,7 +32,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
leds {
compatible = "gpio-leds";
@@ -288,6 +300,12 @@
@@ -303,6 +315,12 @@
rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
};
&sdmmc {
@@ -328,3 +346,12 @@
@@ -343,3 +361,12 @@
&usb_host0_ohci {
status = "okay";
};

View File

@ -14,7 +14,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -354,4 +354,11 @@
@@ -369,4 +369,11 @@
&usbdrd_dwc3 {
dr_mode = "host";
status = "okay";