diff options
author | Michael Turquette <mturquette@baylibre.com> | 2015-06-19 17:37:14 +0300 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2015-06-19 17:37:14 +0300 |
commit | 909aa10e6d6a9524f95dadb6b3ded1c38ec34e11 (patch) | |
tree | 5fb10cd60e0b3c0b2372e1aed143305b32fe3888 /Documentation | |
parent | 0f57d86787d8b1076ea8f9cbdddda2a46d534a27 (diff) | |
parent | 28df9c2fb6f896179fcffd5a3f5a86e2d1dff0a5 (diff) | |
download | linux-909aa10e6d6a9524f95dadb6b3ded1c38ec34e11.tar.xz |
Merge branch 'ccf/atmel-fixes-for-4.1' of https://github.com/bbrezillon/linux-at91 into clk-fixes
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/clock/at91-clock.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/at91-clock.txt b/Documentation/devicetree/bindings/clock/at91-clock.txt index 7a4d4926f44e..5ba6450693b9 100644 --- a/Documentation/devicetree/bindings/clock/at91-clock.txt +++ b/Documentation/devicetree/bindings/clock/at91-clock.txt @@ -248,7 +248,7 @@ Required properties for peripheral clocks: - #address-cells : shall be 1 (reg is used to encode clk id). - clocks : shall be the master clock phandle. e.g. clocks = <&mck>; -- name: device tree node describing a specific system clock. +- name: device tree node describing a specific peripheral clock. * #clock-cells : from common clock binding; shall be set to 0. * reg: peripheral id. See Atmel's datasheets to get a full list of peripheral ids. |