From 73de205c57edecdb950e697126c7a235c3611895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 3 May 2020 14:44:49 +0200 Subject: [PATCH] kernel: bump 5.4 to 5.4.38 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refreshed patches. Run tested: qemu-x86-64, apalis Build tested: x86/64, ipq40xx, ath79, imx6, sunxi/a53 Signed-off-by: Petr Štetiar --- include/kernel-version.mk | 4 ++-- ...d-soc-only-first-codec-is-master-in-multicodec-s.patch | 2 +- ...-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch | 2 +- ...dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch | 2 +- ...ARM-dts-Revert-all-changes-to-upstream-dts-files.patch | 8 ++++---- target/linux/generic/hack-5.4/904-debloat_dma_buf.patch | 2 +- ...add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 5f364ec207..eccea839c3 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.14 = .176 LINUX_VERSION-4.19 = .115 -LINUX_VERSION-5.4 = .36 +LINUX_VERSION-5.4 = .38 LINUX_KERNEL_HASH-4.14.176 = bcae0956baaeb55dab5bad0401873fbc5baaa7fbe957ea6d27a5ab241cec5ca2 LINUX_KERNEL_HASH-4.19.115 = 11b2d97c8ea5ceb40c5e1d0bb87ad5b2b8c84560181bc60c0d28ec3a3e3801c2 -LINUX_KERNEL_HASH-5.4.36 = b9faea98122e8316af8fb428c942e81797b5d28a8fc59a24a4e47959e3765b8d +LINUX_KERNEL_HASH-5.4.38 = e72b9fa4e3a222d42d64dce9915e5b18f1b75ae722d529a1e560ced2e5d0f30e remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch b/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch index c4f70ea11f..263f3532f3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch @@ -15,7 +15,7 @@ Signed-off-by: Johannes Krude --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c -@@ -1646,7 +1646,15 @@ int snd_soc_runtime_set_dai_fmt(struct s +@@ -1656,7 +1656,15 @@ int snd_soc_runtime_set_dai_fmt(struct s int ret; for_each_rtd_codec_dai(rtd, i, codec_dai) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch b/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch index 04b85fd6c5..db90055343 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch @@ -24,7 +24,7 @@ Signed-off-by: Stefan Wahren --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -634,22 +634,16 @@ +@@ -635,22 +635,16 @@ }; clocks { diff --git a/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch b/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch index 5303e937bd..218a846fa3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch @@ -97,7 +97,7 @@ Signed-off-by: Stefan Wahren dpi: dpi@7e208000 { compatible = "brcm,bcm2835-dpi"; reg = <0x7e208000 0x8c>; -@@ -607,12 +595,6 @@ +@@ -608,12 +596,6 @@ status = "disabled"; }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch b/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch index df922eaf4b..403f534baf 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch @@ -1845,7 +1845,7 @@ Signed-off-by: Phil Elwell #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -540,32 +446,6 @@ +@@ -541,32 +447,6 @@ status = "disabled"; }; @@ -1878,7 +1878,7 @@ Signed-off-by: Phil Elwell i2c1: i2c@7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; -@@ -576,16 +456,6 @@ +@@ -577,16 +457,6 @@ status = "disabled"; }; @@ -1895,7 +1895,7 @@ Signed-off-by: Phil Elwell vec: vec@7e806000 { compatible = "brcm,bcm2835-vec"; reg = <0x7e806000 0x1000>; -@@ -594,20 +464,6 @@ +@@ -595,20 +465,6 @@ status = "disabled"; }; @@ -1916,7 +1916,7 @@ Signed-off-by: Phil Elwell usb: usb@7e980000 { compatible = "brcm,bcm2835-usb"; reg = <0x7e980000 0x10000>; -@@ -619,10 +475,6 @@ +@@ -620,10 +476,6 @@ phys = <&usbphy>; phy-names = "usb2-phy"; }; diff --git a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch index 24971487a4..1b103d5e00 100644 --- a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2673,6 +2673,7 @@ int wake_up_state(struct task_struct *p, +@@ -2668,6 +2668,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch index 58fb20aabb..9784d88546 100644 --- a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch +++ b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch @@ -22,10 +22,10 @@ Signed-off-by: Tim Harvey #include #include #include -@@ -5497,3 +5498,34 @@ out_disable: - DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, 0x13b1, - PCI_CLASS_DISPLAY_VGA, 8, - quirk_reset_lenovo_thinkpad_p50_nvgpu); +@@ -5564,3 +5565,34 @@ static void apex_pci_fixup_class(struct + } + DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a, + PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class); + +#ifdef CONFIG_PCI_HOST_THUNDER_PEM +/*