diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 23:59:22 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 23:59:22 +0300 |
commit | b994a66a9d989b43eff9dac586ac73b04279d196 (patch) | |
tree | 3f82b5015bb23af7d5271354de8302e1e7d41bf6 /Documentation | |
parent | 29b10c606f1a2caa3716f714edb533cbe8b2a20b (diff) | |
parent | 7007b745a508735dc168637294404d6ac0a2d475 (diff) | |
download | linux-b994a66a9d989b43eff9dac586ac73b04279d196.tar.xz |
Merge branch 'pci/layerscape'
- Add Layerscape LX2160A rev2 endpoint mode support (Hou Zhiqiang)
- Convert layerscape to builtin_platform_driver() (Michael Walle)
* pci/layerscape:
PCI: layerscape: Convert to builtin_platform_driver()
PCI: layerscape: Add LX2160A rev2 EP mode support
dt-bindings: PCI: layerscape: Add LX2160A rev2 compatible strings
Diffstat (limited to 'Documentation')
-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 daa99f7d4c3f..6d898dd4a8e2 100644 --- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt +++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt @@ -26,6 +26,7 @@ Required properties: "fsl,ls1046a-pcie-ep", "fsl,ls-pcie-ep" "fsl,ls1088a-pcie-ep", "fsl,ls-pcie-ep" "fsl,ls2088a-pcie-ep", "fsl,ls-pcie-ep" + "fsl,lx2160ar2-pcie-ep", "fsl,ls-pcie-ep" - 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. |