From 5408e811b29643e3fd5f2cd227f17263daa45a74 Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 19 Jul 2021 05:17:10 -0400 Subject: kernel: bump 5.4 to 5.4.133 Manually rebased: pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia --- .../mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch') diff --git a/target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch b/target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch index 0f2dab600b..fde01fa987 100644 --- a/target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch +++ b/target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch @@ -48,7 +48,7 @@ Acked-by: Thomas Petazzoni #include #include "../pci.h" -@@ -204,6 +206,7 @@ struct advk_pcie { +@@ -205,6 +207,7 @@ struct advk_pcie { int root_bus_nr; int link_gen; struct pci_bridge_emul bridge; @@ -56,7 +56,7 @@ Acked-by: Thomas Petazzoni }; static inline void advk_writel(struct advk_pcie *pcie, u32 val, u64 reg) -@@ -330,10 +333,31 @@ err: +@@ -331,10 +334,31 @@ err: dev_err(dev, "link never came up\n"); } @@ -88,7 +88,7 @@ Acked-by: Thomas Petazzoni /* Set to Direct mode */ reg = advk_readl(pcie, CTRL_CONFIG_REG); reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT); -@@ -406,7 +430,8 @@ static void advk_pcie_setup_hw(struct ad +@@ -417,7 +441,8 @@ static void advk_pcie_setup_hw(struct ad /* * PERST# signal could have been asserted by pinctrl subsystem before @@ -98,7 +98,7 @@ Acked-by: Thomas Petazzoni * fundamental reset. As required by PCI Express spec a delay for at * least 100ms after such a reset before link training is needed. */ -@@ -1124,6 +1149,22 @@ static int advk_pcie_probe(struct platfo +@@ -1135,6 +1160,22 @@ static int advk_pcie_probe(struct platfo return ret; } -- cgit v1.2.3