diff options
author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-03-25 20:56:18 +0800 |
---|---|---|
committer | Philippe Schenker <philippe.schenker@toradex.com> | 2019-05-13 12:58:04 +0200 |
commit | fd3dae677218a8e2bb86f6cef964c0233d0f8e57 (patch) | |
tree | 3b52c2eca6fa6de91dfd0e329ff82f4ddf41b33d /Documentation | |
parent | a92effb3405567b45ce07e7ecd8dcd250552fbae (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 f9302eb42ad8f597b46e681b5ad402af3fb7dd9d)
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt index 2f89db88fd57..b619733df292 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt @@ -6,7 +6,7 @@ Required properties: - 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 (e.g. i.MX SSI controller) - audio-codec : The phandle of the SGTL5000 audio codec @@ -32,6 +32,8 @@ Required properties: * Line Out Jack * Ext Spk +Optional properties: + - mux-int-port : The internal port of the i.MX audio muxer (AUDMUX) - mux-ext-port : The external port of the i.MX audio muxer @@ -45,7 +47,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", |