aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-19 13:36:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-19 13:36:50 -0400
commitbb16140a2cab5415ffcbb23594da9e495df1bab7 (patch)
treeec3cf77fb983d50c10da53c75ab03b9bc84a1ecd /Documentation
parent9a10758c4475ea9576a62828b6097dcf79f6d3e2 (diff)
parent909aa10e6d6a9524f95dadb6b3ded1c38ec34e11 (diff)
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Michael Turquette: "Very late clk regression fixes for the ARM-based AT91 platform. These went unnoticed by me until recently, hence the late pull request" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: at91: fix h32mx prototype inclusion in pmc header clk: at91: trivial: typo in peripheral clock description clk: at91: fix PERIPHERAL_MAX_SHIFT definition clk: at91: pll: fix input range validity check
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/at91-clock.txt2
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:
248- #address-cells : shall be 1 (reg is used to encode clk id). 248- #address-cells : shall be 1 (reg is used to encode clk id).
249- clocks : shall be the master clock phandle. 249- clocks : shall be the master clock phandle.
250 e.g. clocks = <&mck>; 250 e.g. clocks = <&mck>;
251- name: device tree node describing a specific system clock. 251- name: device tree node describing a specific peripheral clock.
252 * #clock-cells : from common clock binding; shall be set to 0. 252 * #clock-cells : from common clock binding; shall be set to 0.
253 * reg: peripheral id. See Atmel's datasheets to get a full 253 * reg: peripheral id. See Atmel's datasheets to get a full
254 list of peripheral ids. 254 list of peripheral ids.