diff options
author | Mike Turquette <mturquette@linaro.org> | 2013-12-20 15:53:02 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-12-20 15:53:02 -0500 |
commit | 7cba64cd901b21c6c162f8dce4353acec29ae2a8 (patch) | |
tree | b2f86681050be4395efc4d5edb51c386d21196cb /Documentation | |
parent | 24c039f6acacd63e739b39a030197d5a2945e0d2 (diff) | |
parent | ba52f8a986089e263ea28e231b6a405769ae1235 (diff) |
Merge tag 'zynq-clk-for-3.14-v2' of git://git.xilinx.com/linux-xlnx into clk-next
arm: Xilinx Zynq clk patches for v3.14
- Add support for fclk-enable feature
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt b/Documentation/devicetree/bindings/clock/zynq-7000.txt index d99af878f5d7..17b4a94916d6 100644 --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt | |||
@@ -22,6 +22,10 @@ Required properties: | |||
22 | Optional properties: | 22 | Optional properties: |
23 | - clocks : as described in the clock bindings | 23 | - clocks : as described in the clock bindings |
24 | - clock-names : as described in the clock bindings | 24 | - clock-names : as described in the clock bindings |
25 | - fclk-enable : Bit mask to enable FCLKs statically at boot time. | ||
26 | Bit [0..3] correspond to FCLK0..FCLK3. The corresponding | ||
27 | FCLK will only be enabled if it is actually running at | ||
28 | boot time. | ||
25 | 29 | ||
26 | Clock inputs: | 30 | Clock inputs: |
27 | The following strings are optional parameters to the 'clock-names' property in | 31 | The following strings are optional parameters to the 'clock-names' property in |