ENGR00310785 ARM: imx6sx: dts: Move sound nodes to sub-dts for arm2 boards

We disable spdif and sai in imx6sx-*-arm2.dts and only enable them
in their sub-dts like imx6sx-17x17-arm2-spdif.dts while we haven't
put the sound nodes into the sub-dts because the dependancy between
sound and spdif/sai. This would result people get the frequent -517
probe error everytime they insert a new device or module.

So this patch puts them to the sub-dts.

Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>

4 files changed, 24 insertions, 20 deletions

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts
index c69db8bd8c0d..9f2843c8968b 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts
@@ -8,6 +8,17 @@
 
 #include "imx6sx-17x17-arm2.dts"
 
+/ {
+        sound-spdif {
+                compatible = "fsl,imx-audio-spdif",
+                           "fsl,imx-sabreauto-spdif";
+                model = "imx-spdif";
+                spdif-controller = <&spdif>;
+                spdif-in;
+                spdif-out;
+        };
+};
+
 &audmux {
         /* pin conflict with spdif */
         status = "disabled";
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 77a8fa977c0f..a2511d8aa103 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -102,15 +102,6 @@
                 mux-int-port = <1>;
                 mux-ext-port = <4>;
         };
-
-        sound-spdif {
-                compatible = "fsl,imx-audio-spdif",
-                           "fsl,imx-sabreauto-spdif";
-                model = "imx-spdif";
-                spdif-controller = <&spdif>;
-                spdif-in;
-                spdif-out;
-        };
 };
 
 &adc1 {
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-sai.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-sai.dts
index f0f232696d1d..51754d3f6ca2 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2-sai.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-sai.dts
@@ -8,6 +8,19 @@
 
 #include "imx6sx-19x19-arm2.dts"
 
+/ {
+        sound-sgtl5000 {
+                compatible = "fsl,imx6sx-arm2-sgtl5000",
+                           "fsl,imx-audio-sgtl5000";
+                model = "imx6sx-arm2-sgtl5000";
+                cpu-dai = <&sai1>;
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "LINE_IN", "Line In Jack",
+                        "Headphone Jack", "HP_OUT";
+        };
+};
+
 &esai {
         /* pin conflict with sai */
         status = "disabled";
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index 1125e943cd70..e7abb2a78ab7 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -87,17 +87,6 @@
                 asrc-controller = <&asrc_p2p>;
                 audio-codec = <&cs42888>;
         };
-
-        sound-sgtl5000 {
-                compatible = "fsl,imx6sx-arm2-sgtl5000",
-                           "fsl,imx-audio-sgtl5000";
-                model = "imx6sx-arm2-sgtl5000";
-                cpu-dai = <&sai1>;
-                audio-codec = <&sgtl5000>;
-                audio-routing =
-                        "LINE_IN", "Line In Jack",
-                        "Headphone Jack", "HP_OUT";
-        };
 };
 
 &esai {