diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 21:28:44 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 21:28:44 +0300 |
| commit | f3c91098a444c905b69a83a4947d9dbc774f986d (patch) | |
| tree | ba8bd093f099c33c09ad5f9743c3eac44e54d30d /Documentation | |
| parent | 248c51d9a739478b3cfb24fd931187bf1f46fb71 (diff) | |
| parent | 58dfb24349e1d0aa6461d2b0f2811b46fe350280 (diff) | |
| download | linux-f3c91098a444c905b69a83a4947d9dbc774f986d.tar.xz | |
Merge branch 'lorenzo/pci/dwc'
* lorenzo/pci/dwc:
PCI: histb: Add an optional regulator for PCIe port power control
PCI: histb: Fix error path of histb_pcie_host_enable()
PCI: qcom: Use regulator bulk api for apq8064 supplies
PCI: qcom: Add missing supplies required for msm8996
PCI: designware-ep: Fix typo in error message
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/pci/qcom,pcie.txt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt b/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt index c84bc027930b..760b4d740616 100644 --- a/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt +++ b/Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt @@ -34,6 +34,7 @@ Required properties Optional properties: - reset-gpios: The gpio to generate PCIe PERST# assert and deassert signal. +- vpcie-supply: The regulator in charge of PCIe port power. - phys: List of phandle and phy mode specifier, should be 0. - phy-names: Must be "phy". diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt index 3c9d321b3d3b..1fd703bd73e0 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt @@ -189,6 +189,10 @@ Value type: <phandle> Definition: A phandle to the analog power supply for IC which generates reference clock +- vddpe-3v3-supply: + Usage: optional + Value type: <phandle> + Definition: A phandle to the PCIe endpoint power supply - phys: Usage: required for apq8084 |