tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'pci/controller/dwc-edma'

- Verify that if DT specifies a single IRQ for all eDMA channels, it is
named 'dma' (Niklas Cassel)

- Remove qcom edma.nr_irqs initialization, which is redundant since
dw_pcie_edma_irq_verify() initializes it based on whether the DT contains
'dma' (single IRQ) or 'dmaX' (multiple IRQs) (Niklas Cassel)

* pci/controller/dwc-edma:
PCI: qcom-ep: Remove redundant edma.nr_irqs initialization
PCI: dwc: Verify the single eDMA IRQ in dw_pcie_edma_irq_verify()

Bjorn Helgaas 0a09e231 f2b2fcf6

+1 -4
+1 -3
drivers/pci/controller/dwc/pcie-designware.c
··· 981 981 char name[15]; 982 982 int ret; 983 983 984 - if (pci->edma.nr_irqs == 1) 985 - return 0; 986 - else if (pci->edma.nr_irqs > 1) 984 + if (pci->edma.nr_irqs > 1) 987 985 return pci->edma.nr_irqs != ch_cnt ? -EINVAL : 0; 988 986 989 987 ret = platform_get_irq_byname_optional(pdev, "dma");
-1
drivers/pci/controller/dwc/pcie-qcom-ep.c
··· 873 873 pcie_ep->pci.dev = dev; 874 874 pcie_ep->pci.ops = &pci_ops; 875 875 pcie_ep->pci.ep.ops = &pci_ep_ops; 876 - pcie_ep->pci.edma.nr_irqs = 1; 877 876 878 877 pcie_ep->cfg = of_device_get_match_data(dev); 879 878 if (pcie_ep->cfg && pcie_ep->cfg->hdma_support) {