diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-03-28 14:11:30 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 19:17:43 -0400 |
commit | 3ec9147d4f9eeffb0f3a0439c3edd6bd01c40ed3 (patch) | |
tree | 4a487eb6216e7fc7384eb9fc273b45895628ec59 | |
parent | f9cd2b3bf48b108c7935fa06e833e85b5f1d0119 (diff) |
ARM: tegra: add clocks property to AC'97 sound nodes
Audio-related clocks need to be represented in the device tree. Update
bindings to describe which clocks are needed, and DT files to include
those clocks.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r-- | Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20-colibri-512.dtsi | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt index be35d34e8b26..ad589b163639 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt | |||
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : "nvidia,tegra-audio-wm9712" | 4 | - compatible : "nvidia,tegra-audio-wm9712" |
5 | - clocks : Must contain an entry for each entry in clock-names. | ||
6 | - clock-names : Must include the following entries: | ||
7 | "pll_a" (The Tegra clock of that name), | ||
8 | "pll_a_out0" (The Tegra clock of that name), | ||
9 | "mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk) | ||
5 | - nvidia,model : The user-visible name of this sound complex. | 10 | - nvidia,model : The user-visible name of this sound complex. |
6 | - nvidia,audio-routing : A list of the connections between audio components. | 11 | - nvidia,audio-routing : A list of the connections between audio components. |
7 | Each entry is a pair of strings, the first being the connection's sink, | 12 | Each entry is a pair of strings, the first being the connection's sink, |
@@ -48,4 +53,7 @@ sound { | |||
48 | "Mic", "MIC1"; | 53 | "Mic", "MIC1"; |
49 | 54 | ||
50 | nvidia,ac97-controller = <&ac97>; | 55 | nvidia,ac97-controller = <&ac97>; |
56 | |||
57 | clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; | ||
58 | clock-names = "pll_a", "pll_a_out0", "mclk"; | ||
51 | }; | 59 | }; |
diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi index 4e3afdef28a8..d953ccca1efd 100644 --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi | |||
@@ -473,6 +473,9 @@ | |||
473 | "Mic", "MIC1"; | 473 | "Mic", "MIC1"; |
474 | 474 | ||
475 | nvidia,ac97-controller = <&ac97>; | 475 | nvidia,ac97-controller = <&ac97>; |
476 | |||
477 | clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; | ||
478 | clock-names = "pll_a", "pll_a_out0", "mclk"; | ||
476 | }; | 479 | }; |
477 | 480 | ||
478 | regulators { | 481 | regulators { |