diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-03-25 20:56:18 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-01-15 21:17:59 -0600 |
| commit | a4301d5b09a7697d657a548c81a79aa12e4ba926 (patch) | |
| tree | f50d6ed7efc0fbaf920076335b99bd1bc647453a /Documentation | |
| parent | 42325f2defd237dbd7dfd2200e0c8da61f1f1bde (diff) | |
ENGR00305648-1 ASoC: imx-sgtl5000: Support non-ssi cpu-dai
The current imx-sgtl5000 driver always attaches the cpu-dai to ssi while
in fact it could be attached to other cpu-dais like SAI. Thus this patch
use a general code to support another cpu-dai. And meanwhile update the
devicetree for i.MX6 Series.
Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
(cherry picked from commit cb5dfaf44d2fdbce4329c2e4762e8450c8cd3b3c)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt index e4acdd891e49..04bb62b20dd2 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt @@ -3,7 +3,7 @@ Freescale i.MX audio complex with SGTL5000 codec Required properties: - compatible : "fsl,imx-audio-sgtl5000" - model : The user-visible name of this sound complex -- ssi-controller : The phandle of the i.MX SSI controller +- cpu-dai : The phandle of CPU dai - audio-codec : The phandle of the SGTL5000 audio codec - audio-routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, @@ -38,7 +38,7 @@ sound { compatible = "fsl,imx51-babbage-sgtl5000", "fsl,imx-audio-sgtl5000"; model = "imx51-babbage-sgtl5000"; - ssi-controller = <&ssi1>; + cpu-dai = <&ssi1>; audio-codec = <&sgtl5000>; audio-routing = "MIC_IN", "Mic Jack", |