kernel: bump 5.10 to 5.10.115

[openwrt/staging/chunkeey.git] / target / linux / generic / pending-5.15 / 850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch

diff --git a/target/linux/generic/pending-5.15/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch b/target/linux/generic/pending-5.15/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch
index 47a26ceeb80077a371b6e475a100502ae73110e0..e3eaab61f9ba285a9fd329253a0cd452804c965e 100644 (file)
--- a/target/linux/generic/pending-5.15/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch
+++ b/target/linux/generic/pending-5.15/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch
@@ -23,7 +23,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -275,6 +275,7 @@ struct advk_pcie {
+@@ -268,6 +268,7 @@ struct advk_pcie {
                u32 actions;
        } wins[OB_WIN_COUNT];
        u8 wins_count;
@@ -31,7 +31,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
        struct irq_domain *irq_domain;
        struct irq_chip irq_chip;
        raw_spinlock_t irq_lock;
-@@ -1442,21 +1443,26 @@ static void advk_pcie_handle_int(struct
+@@ -1432,21 +1433,26 @@ static void advk_pcie_handle_int(struct
        }
  }
  
@@ -68,7 +68,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  }
  
  static void __maybe_unused advk_pcie_disable_phy(struct advk_pcie *pcie)
-@@ -1523,7 +1529,7 @@ static int advk_pcie_probe(struct platfo
+@@ -1513,7 +1519,7 @@ static int advk_pcie_probe(struct platfo
        struct advk_pcie *pcie;
        struct pci_host_bridge *bridge;
        struct resource_entry *entry;
@@ -77,7 +77,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  
        bridge = devm_pci_alloc_host_bridge(dev, sizeof(struct advk_pcie));
        if (!bridge)
-@@ -1611,17 +1617,9 @@ static int advk_pcie_probe(struct platfo
+@@ -1599,17 +1605,9 @@ static int advk_pcie_probe(struct platfo
        if (IS_ERR(pcie->base))
                return PTR_ERR(pcie->base);
  
@@ -98,7 +98,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  
        pcie->reset_gpio = devm_gpiod_get_from_of_node(dev, dev->of_node,
                                                       "reset-gpios", 0,
-@@ -1670,11 +1668,14 @@ static int advk_pcie_probe(struct platfo
+@@ -1658,11 +1656,14 @@ static int advk_pcie_probe(struct platfo
                return ret;
        }
  
@@ -113,7 +113,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
                advk_pcie_remove_msi_irq_domain(pcie);
                advk_pcie_remove_irq_domain(pcie);
                return ret;
-@@ -1722,6 +1723,9 @@ static int advk_pcie_remove(struct platf
+@@ -1710,6 +1711,9 @@ static int advk_pcie_remove(struct platf
        advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
        advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);