diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:24 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:24 -0500 |
commit | bdc4bb13773955d33f8fd23d79afbc95fda8dca4 (patch) | |
tree | 2efd1406256547eeba91529ed0aa24c57182507f /Documentation | |
parent | fd83941d50cbbe70e9dc1929d8f4631dd56d8c62 (diff) | |
parent | 2435cdd0c3bb8ad067efb1b2f4c992f680c50b7c (diff) | |
download | lwn-bdc4bb13773955d33f8fd23d79afbc95fda8dca4.tar.gz lwn-bdc4bb13773955d33f8fd23d79afbc95fda8dca4.zip |
Merge branch 'lorenzo/pci/armada8k'
- enable register clock for Armada 7K/8K (Gregory CLEMENT)
* lorenzo/pci/armada8k:
PCI: armada8k: Fix clock resource by adding a register clock
PCI: armada8k: Remove useless test before clk_disable_unprepare()
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/pci/pci-armada8k.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pci/pci-armada8k.txt b/Documentation/devicetree/bindings/pci/pci-armada8k.txt index c1e4c3d10a74..9e3fc15e1af8 100644 --- a/Documentation/devicetree/bindings/pci/pci-armada8k.txt +++ b/Documentation/devicetree/bindings/pci/pci-armada8k.txt @@ -12,7 +12,10 @@ Required properties: - "ctrl" for the control register region - "config" for the config space region - interrupts: Interrupt specifier for the PCIe controler -- clocks: reference to the PCIe controller clock +- clocks: reference to the PCIe controller clocks +- clock-names: mandatory if there is a second clock, in this case the + name must be "core" for the first clock and "reg" for the second + one Example: |