aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeontx
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-05-03 14:44:49 +0200
committerPetr Štetiar <ynezz@true.cz>2020-05-04 21:09:12 +0200
commit73de205c57edecdb950e697126c7a235c3611895 (patch)
treef77c4a5b48b361222dd1142301fdb894544462a3 /target/linux/octeontx
parentb9cf9ebdb7aab1be0b9ee9825c71c313259d22da (diff)
downloadupstream-73de205c57edecdb950e697126c7a235c3611895.tar.gz
upstream-73de205c57edecdb950e697126c7a235c3611895.tar.bz2
upstream-73de205c57edecdb950e697126c7a235c3611895.zip
kernel: bump 5.4 to 5.4.38
Refreshed patches. Run tested: qemu-x86-64, apalis Build tested: x86/64, ipq40xx, ath79, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/octeontx')
-rw-r--r--target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch8
1 files changed, 4 insertions, 4 deletions
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 <tharvey@gateworks.com>
#include <linux/platform_data/x86/apple.h>
#include <linux/pm_runtime.h>
#include <linux/switchtec.h>
-@@ -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
+/*