diff options
author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-08 19:13:15 +0800 |
---|---|---|
committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:00:15 -0600 |
commit | e2dd62f2810a395cc75f97cc18afbc8c58e10e22 (patch) | |
tree | 6b772e6e742ae5bb75a02dcbd045eaab89c9f691 /arch/arm/boot/dts/imx6qdl-sabresd.dtsi | |
parent | c8428c9901c0acebf46722d366377598c19d5652 (diff) |
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 <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
(cherry picked from commit b6fca438dde1b4c0bbdee31729871d601f287dc9)
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-sabresd.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index a7c90a313849..e4e2c7448831 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -113,7 +113,7 @@ 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", |