summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-03-19 10:56:47 -0500
committerBjorn Helgaas <bhelgaas@google.com>2015-03-19 10:56:47 -0500
commit85e8a0af374090e0bd89b781a1d3aa0eb4fcdfa0 (patch)
tree7e388598f4837e4da6124c37430984e8e4911306 /drivers/of
parent06e5801b8cb3fc057d88cb4dc03c0b64b2744cda (diff)
parent9a6d7298b0833614c411f774c46514efb1bd5651 (diff)
parent646c0282df04265f77ebd5ad3beae671e59acd5b (diff)
downloadlinux-85e8a0af374090e0bd89b781a1d3aa0eb4fcdfa0.tar.bz2
Merge branches 'pci/iommu' and 'pci/resource' into next
* pci/iommu: of: Calculate device DMA masks based on DT dma-range size arm: dma-mapping: limit IOMMU mapping size PCI: Update DMA configuration from DT of/pci: Add of_pci_dma_configure() to update DMA configuration PCI: Add helper functions pci_get[put]_host_bridge_device() of: Fix size when dma-range is not used of: Move of_dma_configure() to device.c to help re-use of: iommu: Add ptr to OF node arg to of_iommu_configure() * pci/resource: PCI: Fail pci_ioremap_bar() on unassigned resources PCI: Show driver, BAR#, and resource on pci_ioremap_bar() failure PCI: Mark invalid BARs as unassigned PNP: Don't check for overlaps with unassigned PCI BARs