diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-01-16 12:53:21 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-01-16 20:51:14 +0100 |
| commit | 61e58f7cecb9f6044375dd7839f56a6e07807903 (patch) | |
| tree | 98dd9710ba87d1aa00f4d398c6af080cace49b34 /target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch | |
| parent | 7229981994d3459e9bd5911b3e36fd09ab4ec428 (diff) | |
| download | upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.tar.gz upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.tar.bz2 upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.zip | |
kernel: bump 5.10 to 5.10.92
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch b/target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch index fbed9cc506..e6ae3602ca 100644 --- a/target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch +++ b/target/linux/generic/pending-5.10/850-0004-PCI-aardvark-Rewrite-IRQ-code-to-chained-IRQ-handler.patch @@ -21,8 +21,6 @@ Signed-off-by: Marek Behún <kabel@kernel.org> drivers/pci/controller/pci-aardvark.c | 48 +++++++++++++++------------ 1 file changed, 26 insertions(+), 22 deletions(-) -diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c -index e68773527171..01dfe70d9c2c 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -275,6 +275,7 @@ struct advk_pcie { @@ -33,7 +31,7 @@ index e68773527171..01dfe70d9c2c 100644 struct irq_domain *irq_domain; struct irq_chip irq_chip; raw_spinlock_t irq_lock; -@@ -1440,21 +1441,26 @@ static void advk_pcie_handle_int(struct advk_pcie *pcie) +@@ -1440,21 +1441,26 @@ static void advk_pcie_handle_int(struct } } @@ -70,7 +68,7 @@ index e68773527171..01dfe70d9c2c 100644 } static void __maybe_unused advk_pcie_disable_phy(struct advk_pcie *pcie) -@@ -1521,7 +1527,7 @@ static int advk_pcie_probe(struct platform_device *pdev) +@@ -1521,7 +1527,7 @@ static int advk_pcie_probe(struct platfo struct advk_pcie *pcie; struct pci_host_bridge *bridge; struct resource_entry *entry; @@ -79,7 +77,7 @@ index e68773527171..01dfe70d9c2c 100644 bridge = devm_pci_alloc_host_bridge(dev, sizeof(struct advk_pcie)); if (!bridge) -@@ -1609,17 +1615,9 @@ static int advk_pcie_probe(struct platform_device *pdev) +@@ -1609,17 +1615,9 @@ static int advk_pcie_probe(struct platfo if (IS_ERR(pcie->base)) return PTR_ERR(pcie->base); @@ -100,7 +98,7 @@ index e68773527171..01dfe70d9c2c 100644 pcie->reset_gpio = devm_gpiod_get_from_of_node(dev, dev->of_node, "reset-gpios", 0, -@@ -1668,11 +1666,14 @@ static int advk_pcie_probe(struct platform_device *pdev) +@@ -1668,11 +1666,14 @@ static int advk_pcie_probe(struct platfo return ret; } @@ -115,7 +113,7 @@ index e68773527171..01dfe70d9c2c 100644 advk_pcie_remove_msi_irq_domain(pcie); advk_pcie_remove_irq_domain(pcie); return ret; -@@ -1720,6 +1721,9 @@ static int advk_pcie_remove(struct platform_device *pdev) +@@ -1720,6 +1721,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); @@ -125,6 +123,3 @@ index e68773527171..01dfe70d9c2c 100644 /* Remove IRQ domains */ advk_pcie_remove_msi_irq_domain(pcie); advk_pcie_remove_irq_domain(pcie); --- -2.34.1 - |