summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2013-12-30 10:58:22 -0800
committerMike Turquette <mturquette@linaro.org>2013-12-30 10:58:22 -0800
commit391e3903e63781debc52a0de73f2e922dcc3f602 (patch)
tree0f06e9555dc43090f265cbe726eb6051bf7a0d51 /Documentation
parent6b71e0d9d6bfd24d2426a4ea7edf3c01d872903f (diff)
parente0c223ec67a98f70770eec85e625015f5af69f10 (diff)
downloadlinux-391e3903e63781debc52a0de73f2e922dcc3f602.tar.gz
linux-391e3903e63781debc52a0de73f2e922dcc3f602.tar.bz2
linux-391e3903e63781debc52a0de73f2e922dcc3f602.zip
Merge branch 'for_3.14/keystone-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into clk-next-keystone
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/keystone-pll.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/clock/keystone-pll.txt b/Documentation/devicetree/bindings/clock/keystone-pll.txt
index 12bd72605a31..225990f79b7c 100644
--- a/Documentation/devicetree/bindings/clock/keystone-pll.txt
+++ b/Documentation/devicetree/bindings/clock/keystone-pll.txt
@@ -17,13 +17,14 @@ Required properties:
- reg - pll control0 and pll multipler registers
- reg-names : control and multiplier. The multiplier is applicable only for
main pll clock
-- fixed-postdiv : fixed post divider value
+- fixed-postdiv : fixed post divider value. If absent, use clkod register bits
+ for postdiv
Example:
mainpllclk: mainpllclk@2310110 {
#clock-cells = <0>;
compatible = "ti,keystone,main-pll-clock";
- clocks = <&refclkmain>;
+ clocks = <&refclksys>;
reg = <0x02620350 4>, <0x02310110 4>;
reg-names = "control", "multiplier";
fixed-postdiv = <2>;
@@ -32,11 +33,10 @@ Example:
papllclk: papllclk@2620358 {
#clock-cells = <0>;
compatible = "ti,keystone,pll-clock";
- clocks = <&refclkmain>;
+ clocks = <&refclkpass>;
clock-output-names = "pa-pll-clk";
reg = <0x02620358 4>;
reg-names = "control";
- fixed-postdiv = <6>;
};
Required properties: