ENGR00305648-4 ARM: imx6sx: Add SPDIF support to 19x19 arm2 board

Add SPDIF support to 19x19 arm2 board and create a new dts for it due to
pin conflict.

Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>

3 files changed, 34 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ce7306833c26..058af19f340e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -137,6 +137,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6sl-evk-ldo.dtb \
         imx6sl-evk-pf200.dtb \
         imx6sx-17x17-arm2.dtb \
+        imx6sx-17x17-arm2-spdif.dtb \
         imx6sx-19x19-arm2.dtb \
         imx6sx-19x19-arm2-lcdif1.dtb \
         imx6sx-sdb.dtb \
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts
new file mode 100644
index 000000000000..c69db8bd8c0d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2-spdif.dts
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sx-17x17-arm2.dts"
+
+&audmux {
+        /* pin conflict with spdif */
+        status = "disabled";
+};
+
+&spdif {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 23a6b3c87ccd..b7454023f2ec 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -102,6 +102,15 @@
                 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 {
@@ -438,6 +447,12 @@
         };
 };
 
+&spdif {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_spdif_1>;
+        status = "disabled";
+};
+
 &ssi1 {
         fsl,mode = "i2s-slave";
         status = "okay";