diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:15:34 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:15:34 +0300 |
| commit | dda718926c0fe091fd5c7ed3f88c9542d8bf67cf (patch) | |
| tree | e0dbcf80e424095db9715a74d92c4d2facd2ca59 /Documentation/devicetree/bindings/pci | |
| parent | e2dc4f225b765c2a12e5eaa7bc09994e67d13741 (diff) | |
| parent | 8ed81ec82a8c57c3a6ad69b4c4d3e4801163c256 (diff) | |
| download | linux-dda718926c0fe091fd5c7ed3f88c9542d8bf67cf.tar.xz | |
Merge branch 'pci/host-mvebu' into next
* pci/host-mvebu:
PCI: mvebu: Change delay after reset to the PCIe spec mandated 100ms
PCI: mvebu: Handle changes to the bridge windows while enabled
Diffstat (limited to 'Documentation/devicetree/bindings/pci')
| -rw-r--r-- | Documentation/devicetree/bindings/pci/mvebu-pci.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt index 08c716b2c6b6..2de6f65ecfb1 100644 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt @@ -78,7 +78,8 @@ and the following optional properties: multiple lanes. If this property is not found, we assume that the value is 0. - reset-gpios: optional gpio to PERST# -- reset-delay-us: delay in us to wait after reset de-assertion +- reset-delay-us: delay in us to wait after reset de-assertion, if not + specified will default to 100ms, as required by the PCIe specification. Example: |