From 53a25bebe307f250d33107a7973947072742fd15 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Tue, 5 May 2020 11:50:15 +0800
Subject: [PATCH] octeontx: refresh 5.4 patches

---
 ...irk-for-Gateworks-PLX-PEX860x-switch-with-.patch | 13 +++++--------
 1 file changed, 5 insertions(+), 8 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 722607d2a6..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,11 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
  #include <linux/platform_data/x86/apple.h>
  #include <linux/pm_runtime.h>
  #include <linux/switchtec.h>
-@@ -5547,6 +5548,37 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR
- 			      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
 +/*
 + * fixup for PLX PEX8909 bridge to configure GPIO1-7 as output High
@@ -56,7 +57,3 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
 +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8606, newport_pciesw_early_fixup);
 +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8604, newport_pciesw_early_fixup);
 +#endif /* CONFIG_PCI_HOST_THUNDER_PEM */
-+
- /*
-  * Device [1b21:2142]
-  * When in D0, PME# doesn't get asserted when plugging USB 3.0 device.