summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@linaro.org>2015-02-02 15:01:10 -0800
committerMichael Turquette <mturquette@linaro.org>2015-02-02 15:01:10 -0800
commitf85c6edfae0fea807956fd7890fc680414800cb7 (patch)
tree2d067ea135107f53b0e29747477edaeca238d761 /Documentation
parent54eea32f7ed3037c91853924227585b65df909a8 (diff)
parentb270491eb9a033a1ab6c66e778c9dd3e3a4f7639 (diff)
downloadlinux-f85c6edfae0fea807956fd7890fc680414800cb7.tar.gz
linux-f85c6edfae0fea807956fd7890fc680414800cb7.tar.bz2
linux-f85c6edfae0fea807956fd7890fc680414800cb7.zip
Merge tag 'tegra-clk-3.20' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next
Tegra clock fixes for 3.20
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt b/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
index ded5d6212c84..c6620bc96703 100644
--- a/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+++ b/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
@@ -1,4 +1,4 @@
-NVIDIA Tegra124 Clock And Reset Controller
+NVIDIA Tegra124 and Tegra132 Clock And Reset Controller
This binding uses the common clock binding:
Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -7,14 +7,16 @@ The CAR (Clock And Reset) Controller on Tegra is the HW module responsible
for muxing and gating Tegra's clocks, and setting their rates.
Required properties :
-- compatible : Should be "nvidia,tegra124-car"
+- compatible : Should be "nvidia,tegra124-car" or "nvidia,tegra132-car"
- reg : Should contain CAR registers location and length
- clocks : Should contain phandle and clock specifiers for two clocks:
the 32 KHz "32k_in", and the board-specific oscillator "osc".
- #clock-cells : Should be 1.
In clock consumers, this cell represents the clock ID exposed by the
- CAR. The assignments may be found in header file
- <dt-bindings/clock/tegra124-car.h>.
+ CAR. The assignments may be found in the header files
+ <dt-bindings/clock/tegra124-car-common.h> (which covers IDs common
+ to Tegra124 and Tegra132) and <dt-bindings/clock/tegra124-car.h>
+ (for Tegra124-specific clocks).
- #reset-cells : Should be 1.
In clock consumers, this cell represents the bit number in the CAR's
array of CLK_RST_CONTROLLER_RST_DEVICES_* registers.