summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-12-20 12:38:07 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-12-20 12:38:07 -0700
commit4bd70bc997afbc7d6a2f57739b34802611dfe455 (patch)
tree6a5a6484dc62d084649ed118e4124e29c5485109 /Documentation
parent608235a30706814dfff5b23938dc5f14fdb7e7e3 (diff)
parentbc9ef770047a931787e1b1e092dbe3993ce4e0fb (diff)
Merge branch 'pci/host-imx6' into next
* pci/host-imx6: PCI: imx6: Fix bugs in PCIe startup code PCI: imx6: Start link in Gen1 before negotiating for Gen2 mode PCI: imx6: Factor out link up wait loop PCI: imx6: Factor out PHY reset PCI: imx6: Report "link up" only after link training completes PCI: imx6: Make reset-gpio optional
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/pci/designware-pcie.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt b/Documentation/devicetree/bindings/pci/designware-pcie.txt
index d5d26d443693..d6fae13ff062 100644
--- a/Documentation/devicetree/bindings/pci/designware-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/designware-pcie.txt
@@ -19,6 +19,8 @@ Required properties:
to define the mapping of the PCIe interface to interrupt
numbers.
- num-lanes: number of lanes to use
+
+Optional properties:
- reset-gpio: gpio pin number of power good signal
Optional properties for fsl,imx6q-pcie