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>
This commit is contained in:
Родитель
fcf0b3a6c2
Коммит
f9cd2b3bf4
|
@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- compatible : "nvidia,tegra-audio-alc5632"
|
- 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,model : The user-visible name of this sound complex.
|
||||||
- nvidia,audio-routing : A list of the connections between audio components.
|
- 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,
|
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,i2s-controller = <&tegra_i2s1>;
|
||||||
nvidia,audio-codec = <&alc5632>;
|
nvidia,audio-codec = <&alc5632>;
|
||||||
|
|
||||||
|
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
|
||||||
|
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,6 +2,11 @@ NVIDIA Tegra audio complex for TrimSlice
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- compatible : "nvidia,tegra-audio-trimslice"
|
- 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,i2s-controller : The phandle of the Tegra I2S1 controller
|
||||||
- nvidia,audio-codec : The phandle of the WM8903 audio codec
|
- nvidia,audio-codec : The phandle of the WM8903 audio codec
|
||||||
|
|
||||||
|
@ -11,4 +16,6 @@ sound {
|
||||||
compatible = "nvidia,tegra-audio-trimslice";
|
compatible = "nvidia,tegra-audio-trimslice";
|
||||||
nvidia,i2s-controller = <&tegra_i2s1>;
|
nvidia,i2s-controller = <&tegra_i2s1>;
|
||||||
nvidia,audio-codec = <&codec>;
|
nvidia,audio-codec = <&codec>;
|
||||||
|
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
|
||||||
|
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- compatible : "nvidia,tegra-audio-wm8753"
|
- 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,model : The user-visible name of this sound complex.
|
||||||
- nvidia,audio-routing : A list of the connections between audio components.
|
- 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,
|
Each entry is a pair of strings, the first being the connection's sink,
|
||||||
|
@ -50,5 +55,8 @@ sound {
|
||||||
|
|
||||||
nvidia,i2s-controller = <&i2s1>;
|
nvidia,i2s-controller = <&i2s1>;
|
||||||
nvidia,audio-codec = <&wm8753>;
|
nvidia,audio-codec = <&wm8753>;
|
||||||
|
|
||||||
|
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
|
||||||
|
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,11 @@ NVIDIA Tegra audio complex
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- compatible : "nvidia,tegra-audio-wm8903"
|
- 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,model : The user-visible name of this sound complex.
|
||||||
- nvidia,audio-routing : A list of the connections between audio components.
|
- 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,
|
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,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
||||||
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
|
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
|
||||||
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
|
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";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -669,5 +669,8 @@
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
||||||
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
|
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
|
||||||
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,5 +58,8 @@
|
||||||
|
|
||||||
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -514,5 +514,8 @@
|
||||||
nvidia,audio-codec = <&alc5632>;
|
nvidia,audio-codec = <&alc5632>;
|
||||||
nvidia,i2s-controller = <&tegra_i2s1>;
|
nvidia,i2s-controller = <&tegra_i2s1>;
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,5 +52,8 @@
|
||||||
|
|
||||||
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -821,5 +821,8 @@
|
||||||
|
|
||||||
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
||||||
nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,5 +52,8 @@
|
||||||
|
|
||||||
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -376,5 +376,8 @@
|
||||||
compatible = "nvidia,tegra-audio-trimslice";
|
compatible = "nvidia,tegra-audio-trimslice";
|
||||||
nvidia,i2s-controller = <&tegra_i2s1>;
|
nvidia,i2s-controller = <&tegra_i2s1>;
|
||||||
nvidia,audio-codec = <&codec>;
|
nvidia,audio-codec = <&codec>;
|
||||||
|
|
||||||
|
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
|
||||||
|
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -620,5 +620,8 @@
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
||||||
nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
|
nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
|
||||||
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -573,5 +573,8 @@
|
||||||
|
|
||||||
nvidia,i2s-controller = <&tegra_i2s1>;
|
nvidia,i2s-controller = <&tegra_i2s1>;
|
||||||
nvidia,audio-codec = <&codec>;
|
nvidia,audio-codec = <&codec>;
|
||||||
|
|
||||||
|
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
|
||||||
|
clock-names = "pll_a", "pll_a_out0", "mclk";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -509,5 +509,8 @@
|
||||||
|
|
||||||
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
nvidia,spkr-en-gpios = <&wm8903 2 0>;
|
||||||
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Загрузка…
Ссылка в новой задаче