From a92b94625df6d2a66141be986452a7c42c4fc824 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Tue, 8 Apr 2014 19:13:15 +0800 Subject: MLK-11479-11 ASoC: imx-wm8962: Add non-SSI cpu dai support cherry-pick below patch from v3.14.y: ENGR00307635-5 ASoC: imx-wm8962: Add non-SSI cpu dai support The current imx-wm8962 machine driver is designed for SSI as CPU DAI only while as its name we should make the driver more generic to any other CPU DAI on i.MX serires -- ESAI, SAI for example. So this patch makes the driver more general so as to support those non-SSI cases. Acked-by: Wang Shengjiu Signed-off-by: Nicolin Chen (cherry picked from commit b6fca438dde1b4c0bbdee31729871d601f287dc9) --- Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/devicetree/bindings/sound') diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt index 5006de2b230d..06bc12d4cc76 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt +++ b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.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 - audio-codec : The phandle of the WM8962 audio codec @@ -43,7 +43,7 @@ sound { compatible = "fsl,imx6q-sabresd-wm8962", "fsl,imx-audio-wm8962"; model = "wm8962-audio"; - ssi-controller = <&ssi2>; + cpu-dai = <&ssi2>; audio-codec = <&codec>; audio-routing = "Headphone Jack", "HPOUTL", -- cgit v1.2.3