diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 21:11:33 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 21:11:33 +0300 |
commit | 89000e89bf4df8b9a0a16e1d3856913907385bd5 (patch) | |
tree | 25bd1e3b55dc0ff6df1b76d61cf672f4fbbefdc7 /Documentation/devicetree/bindings/pci | |
parent | aaea12f7fe4c309c8cfa9040cbb3cb02feae0b4d (diff) | |
parent | 84d897d69938a33f4ce3877c82d573e7a2b4e5a9 (diff) | |
download | linux-89000e89bf4df8b9a0a16e1d3856913907385bd5.tar.xz |
Merge branch 'pci/host-layerscape' into next
* pci/host-layerscape:
PCI: layerscape: Change default error response behavior
PCI: Disable MSI for Freescale Layerscape PCIe RC mode
arm64: dts: ls1046a: Add PCIe controller DT nodes
arm64: dts: ls1012a: Add PCIe controller DT node
PCI: layerscape: Add support for ls1012a
arm64: dts: ls1012a: Add MSI controller DT node
irqchip/ls-scfg-msi: Add LS1012a MSI support
Diffstat (limited to 'Documentation/devicetree/bindings/pci')
-rw-r--r-- | Documentation/devicetree/bindings/pci/layerscape-pci.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt index c0484da0f20d..66df1e81e0b8 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -18,6 +18,7 @@ Required properties: "fsl,ls2088a-pcie" "fsl,ls1088a-pcie" "fsl,ls1046a-pcie" + "fsl,ls1012a-pcie" - reg: base addresses and lengths of the PCIe controller register blocks. - interrupts: A list of interrupt outputs of the controller. Must contain an entry for each entry in the interrupt-names property. |