diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:09 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-12-12 11:25:09 -0600 |
| commit | 46275d43c8dbf13d8b0c6e7a455608eeb220a677 (patch) | |
| tree | b4d4725f448181dc0f587310ebfd782909227027 /Documentation/devicetree/bindings/pci | |
| parent | f887e24e0544cb239531c171f835e7e7aac4863b (diff) | |
| parent | 1d77040bde2d21dc7db575d4b43c1da24c94cca1 (diff) | |
| download | talos-op-linux-46275d43c8dbf13d8b0c6e7a455608eeb220a677.tar.gz talos-op-linux-46275d43c8dbf13d8b0c6e7a455608eeb220a677.zip | |
Merge branch 'pci/host-layerscape' into next
* pci/host-layerscape:
PCI: layerscape: Add LS1046a support
PCI: layerscape: Remove redundant error message from ls_pcie_probe()
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 41e9f55a1467..ee1c72d5162e 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -15,6 +15,7 @@ Required properties: - compatible: should contain the platform identifier such as: "fsl,ls1021a-pcie", "snps,dw-pcie" "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie" + "fsl,ls1046a-pcie" - reg: base addresses and lengths of the PCIe controller - interrupts: A list of interrupt outputs of the controller. Must contain an entry for each entry in the interrupt-names property. |
