From 57b115e8f6c8a5db4428db4089a9c0d03bebc738 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 28 Mar 2013 12:11:30 -0600
Subject: [PATCH] --- yaml --- r: 373999 b: refs/heads/master c:
 3ec9147d4f9eeffb0f3a0439c3edd6bd01c40ed3 h: refs/heads/master i:   373997:
 1cf42d64d3ff410e899d36ddac728479b5b3df56   373995:
 f337c7d3a2b8d5d0b0e14c8fda38b5a7ada19173   373991:
 89109e8353e6774c696aa8fe8b20ca2a4bc15bd0   373983:
 8f4b5b6ae2eba4e161d758ea9e1764ef14ee9d0d v: v3

---
 [refs]                                                    | 2 +-
 .../bindings/sound/nvidia,tegra-audio-wm9712.txt          | 8 ++++++++
 trunk/arch/arm/boot/dts/tegra20-colibri-512.dtsi          | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c04f3be9eb18..1166e9ddf1fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9cd2b3bf48b108c7935fa06e833e85b5f1d0119
+refs/heads/master: 3ec9147d4f9eeffb0f3a0439c3edd6bd01c40ed3
diff --git a/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt b/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt
index be35d34e8b26..ad589b163639 100644
--- a/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt
+++ b/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
 
 Required properties:
 - compatible : "nvidia,tegra-audio-wm9712"
+- clocks : Must contain an entry for each entry in clock-names.
+- clock-names : Must include the following entries:
+  "pll_a" (The Tegra clock of that name),
+  "pll_a_out0" (The Tegra clock of that name),
+  "mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
 - nvidia,model : The user-visible name of this sound complex.
 - nvidia,audio-routing : A list of the connections between audio components.
   Each entry is a pair of strings, the first being the connection's sink,
@@ -48,4 +53,7 @@ sound {
 		"Mic", "MIC1";
 
 	nvidia,ac97-controller = <&ac97>;
+
+	clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+	clock-names = "pll_a", "pll_a_out0", "mclk";
 };
diff --git a/trunk/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/trunk/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index 4e3afdef28a8..d953ccca1efd 100644
--- a/trunk/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/trunk/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -473,6 +473,9 @@
 			"Mic", "MIC1";
 
 		nvidia,ac97-controller = <&ac97>;
+
+		clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+		clock-names = "pll_a", "pll_a_out0", "mclk";
 	};
 
 	regulators {