ARM: tegra: add clocks property to 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>

14 files changed, 61 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
index b77a97c9101e..05ffecb57103 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
 
 Required properties:
 - compatible : "nvidia,tegra-audio-alc5632"
+- 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,
@@ -56,4 +61,7 @@ sound {
 
         nvidia,i2s-controller = <&tegra_i2s1>;
         nvidia,audio-codec = <&alc5632>;
+
+        clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+        clock-names = "pll_a", "pll_a_out0", "mclk";
 };
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
index 04b14cfb1f16..ef1fe7358279 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex for TrimSlice
 
 Required properties:
 - compatible : "nvidia,tegra-audio-trimslice"
+- 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,i2s-controller : The phandle of the Tegra I2S1 controller
 - nvidia,audio-codec : The phandle of the WM8903 audio codec
 
@@ -11,4 +16,6 @@ sound {
         compatible = "nvidia,tegra-audio-trimslice";
         nvidia,i2s-controller = <&tegra_i2s1>;
         nvidia,audio-codec = <&codec>;
+        clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+        clock-names = "pll_a", "pll_a_out0", "mclk";
 };
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
index c4dd39ce6165..d14510613a7f 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
 
 Required properties:
 - compatible : "nvidia,tegra-audio-wm8753"
+- 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,
@@ -50,5 +55,8 @@ sound {
 
         nvidia,i2s-controller = <&i2s1>;
         nvidia,audio-codec = <&wm8753>;
+
+        clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+        clock-names = "pll_a", "pll_a_out0", "mclk";
 };
 
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
index d5b0da8bf1d8..3bf722deb722 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
 
 Required properties:
 - compatible : "nvidia,tegra-audio-wm8903"
+- 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,
@@ -67,5 +72,8 @@ sound {
         nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
         nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
         nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+
+        clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+        clock-names = "pll_a", "pll_a_out0", "mclk";
 };
 
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index ae9d5a20834e..2c4da874eb16 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -669,5 +669,8 @@
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
                 nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
                 nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index 52993a1d181f..740ba7c424d4 100644
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -58,5 +58,8 @@
 
                 nvidia,spkr-en-gpios = <&wm8903 2 0>;
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index fd60940e4063..c421db498058 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -514,5 +514,8 @@
                 nvidia,audio-codec = <&alc5632>;
                 nvidia,i2s-controller = <&tegra_i2s1>;
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
index 289480026fbf..7085ae5f0562 100644
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -52,5 +52,8 @@
 
                 nvidia,spkr-en-gpios = <&wm8903 2 0>;
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 4ee700a33ca5..b8f0400823e5 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -821,5 +821,8 @@
 
                 nvidia,spkr-en-gpios = <&wm8903 2 0>;
                 nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index 402b21004bef..9be175d38392 100644
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -52,5 +52,8 @@
 
                 nvidia,spkr-en-gpios = <&wm8903 2 0>;
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index a9f3f06580f5..51b3a44fc063 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -376,5 +376,8 @@
                 compatible = "nvidia,tegra-audio-trimslice";
                 nvidia,i2s-controller = <&tegra_i2s1>;
                 nvidia,audio-codec = <&codec>;
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index f544806e9618..7095e96d0142 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -620,5 +620,8 @@
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
                 nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
                 nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 258cf945f515..99746c618d68 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -573,5 +573,8 @@
 
                 nvidia,i2s-controller = <&tegra_i2s1>;
                 nvidia,audio-codec = <&codec>;
+
+                clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 65bf2b63174e..7edd51e059ae 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -509,5 +509,8 @@
 
                 nvidia,spkr-en-gpios = <&wm8903 2 0>;
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+
+                clocks = <&tegra_car 184>, <&tegra_car 185>, <&tegra_car 120>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };