summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-05-03 16:42:30 (GMT)
committerBjorn Helgaas <bhelgaas@google.com>2016-05-03 16:42:30 (GMT)
commit58f8b094e96f12e899bf767fc658c165908065d4 (patch)
tree1d282522bba2918397fb678232fe1b2a6f4a4b46
parent7f768544c2421c399c0909ad9d5a9f916cd96de3 (diff)
parent1c52a5139fcf3cebfd61be9293bc0da529968c0d (diff)
parenta5cb903aef8c642e6f0f6810d46dacedf666b54a (diff)
parentdeb22e5c84c884a129d801cf3bfde7411536998d (diff)
parentb410f3b68d7ea8ca93abeb3420684c0378b7e134 (diff)
parent1e9f8dcf892ddb183405cb2414bfc37b40300693 (diff)
parentdfc6535a8401b8fd15b18e2a5b8256600dd7e6b6 (diff)
parent76ba8c1f2312e5128ef33e00a29c72c85bb80068 (diff)
parent93bf9073a8a7e844b27327b05ab4dc608354d6fd (diff)
parent88a97da1eab7587036d8bc937d6bc874b8210df1 (diff)
downloadlinux-58f8b094e96f12e899bf767fc658c165908065d4.tar.xz
Merge branches 'pci/host-armada', 'pci/host-designware', 'pci/host-hv', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-thunder' and 'pci/host-vmd' into next
* pci/host-armada: PCI: armada: Add driver for Marvell Armada 7K/8K PCIe controller dt-bindings: pci: add DT binding for Marvell Armada 7K/8K PCIe controller * pci/host-designware: PCI: designware: Remove incorrect RC memory base/limit configuration PCI: designware: Move Root Complex setup code to dw_pcie_setup_rc() * pci/host-hv: PCI: hv: Report resources release after stopping the bus * pci/host-imx6: ARM: dts: imx6qp: Specify imx6qp version of PCIe core PCI: imx6: Implement reset sequence for i.MX6+ PCI: imx6: Use enum instead of bool for variant indicator PCI: imx6: Add DT property for link gen, default to Gen1 PCI: imx6: Add reset-gpio-active-high boolean property to DT ARM: dts: imx6: Fix PCIe reset GPIO polarity on Toradex Apalis Ixora PCI: imx6: Add initial imx6sx support PCI: imx6: Factor out ref clock enable Revert "PCI: imx6: Add support for active-low reset GPIO" * pci/host-keystone: PCI: keystone: Remove unnecessary goto statement PCI: keystone: Add error IRQ handler * pci/host-mvebu: PCI: mvebu: Use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS for mvebu_pcie_pm_ops PCI: mvebu: Constify mvebu_pcie_pm_ops structure * pci/host-rcar: PCI: rcar: Select PCI_MSI_IRQ_DOMAIN * pci/host-thunder: PCI: thunder: Don't clobber read-only bits in bridge config registers * pci/host-vmd: PCI: Remove return values from pcie_port_platform_notify() and relatives PCI/ACPI: Allow all PCIe services on non-ACPI host bridges