summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-01-07 03:09:23 +0300
committerBjorn Helgaas <bhelgaas@google.com>2016-01-07 03:09:23 +0300
commit65d5b109d1ff0d173e1896081f38951eff21978e (patch)
treec6b735931ea038e071d94c8a8a3209162045861d /drivers/pci
parent800e07b609bf31c34c1fa08745812fc721101acc (diff)
parenta574795bc383c4ede89d038d8051d0d1ab4d571f (diff)
parent5c5fb40de8f14391a1238db05cef88754faf9229 (diff)
parent3bc2b2348835f6edd33c383a2fbcf15fe3dac3b2 (diff)
parenta37b3eafe8e9cbe7c7754bc6003c125b23749554 (diff)
downloadlinux-65d5b109d1ff0d173e1896081f38951eff21978e.tar.xz
Merge branches 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-rcar' into next
* pci/host-generic: PCI: generic,versatile: Remove unused pci_sys_data structures * pci/host-imx6: PCI: imx6: Add support for active-low reset GPIO PCI: imx6: Use gpio_set_value_cansleep() * pci/host-iproc: PCI: iproc: Add iProc PCIe MSI support PCI: iproc: Add iProc PCIe MSI device tree binding PCI: iproc: Add PAXC interface support PCI: iproc: Update iProc PCIe device tree binding PCI: iproc: Do not use 0x in front of %pap PCI: iproc: Hide CONFIG_PCIE_IPROC * pci/host-rcar: PCI: rcar: Add gen2 fallback compatibility string for pcie-rcar PCI: rcar: Add gen2 fallback compatibility string for pci-rcar-gen2 PCI: rcar: Add support for R-Car H3 to pcie-rcar Revert "PCI: rcar: Build pcie-rcar.c only on ARM" PCI: rcar: Convert to DT resource parsing API PCI: rcar: Allow DT to override default window settings