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>

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index bdcabc9f5b41..73430596baa9 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -54,7 +54,7 @@
                 compatible = "fsl,imx6q-sabrelite-sgtl5000",
                              "fsl,imx-audio-sgtl5000";
                 model = "imx6q-sabrelite-sgtl5000";
-                ssi-controller = <&ssi1>;
+                cpu-dai = <&ssi1>;
                 audio-codec = <&codec>;
                 audio-routing =
                         "MIC_IN", "Mic Jack",
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 741725ae30b3..23a6b3c87ccd 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -94,7 +94,7 @@
                 compatible = "fsl,imx6sx-arm2-sgtl5000",
                            "fsl,imx-audio-sgtl5000";
                 model = "imx6sx-arm2-sgtl5000";
-                ssi-controller = <&ssi1>;
+                cpu-dai = <&ssi1>;
                 audio-codec = <&codec>;
                 audio-routing =
                         "LINE_IN", "Line In Jack",