From 662e3b4a246ac698a737f09026ad70c57b6ccd86 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Tue, 25 Mar 2014 20:56:18 +0800 Subject: 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 Signed-off-by: Nicolin Chen (cherry picked from commit f9302eb42ad8f597b46e681b5ad402af3fb7dd9d) --- Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Documentation/devicetree') 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", -- cgit v1.2.3