MLK-11724: ARM: dts: add mqs support mx6sx-sd-exp1 board

Add mqs support for mx6sx-sd-exp1 board

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8b6cad7..c6ca147 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -432,6 +432,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
        imx6sx-sdb.dtb  \
        imx6sx-sdb-lcdif1.dtb \
        imx6sx-sdb-ldo.dtb      \
+       imx6sx-sdb-mqs.dtb \
        imx6sx-sdb-sai.dtb \
        imx6sx-19x19-arm2.dtb \
        imx6sx-19x19-arm2-ldo.dtb \

diff --git a/arch/arm/boot/dts/imx6sx-sdb-mqs.dts b/arch/arm/boot/dts/imx6sx-sdb-mqs.dts
new file mode 100644 (file)
index 0000000..e5ff9fb
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-sdb-mqs.dts
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014-2015 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.
+ *
+ * This feature is supported by the MX6SX-SD-EXP1 board
+ *
+ */
+
+#include "imx6sx-sdb.dts"
+/ {
+       sound-mqs {
+               compatible = "fsl,imx6sx-sdb-mqs",
+                               "fsl,imx-audio-mqs";
+               model = "mqs-audio";
+               cpu-dai = <&sai1>;
+               asrc-controller = <&asrc>;
+               audio-codec = <&mqs>;
+       };
+};
+
+&usdhc2 {
+       /* pin conflict with mqs*/
+       status = "disabled";
+};
+
+&mqs {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mqs>;
+       clocks = <&clks IMX6SX_CLK_SAI1>;
+       clock-names = "mclk";
+       status = "okay";
+};
+
+&sai1 {
+       pinctrl-0 = <>;
+       status = "okay";
+};
+
+&sdma {
+       gpr = <&gpr>;
+       /* SDMA event remap for SAI1 */
+       fsl,sdma-event-remap = <0 15 1>, <0 16 1>;
+};

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 9abe9c1..b4bc927 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -794,6 +794,13 @@
                        >;
                };
 
+               pinctrl_mqs: mqsgrp {
+                       fsl,pins = <
+                               MX6SX_PAD_SD2_CLK__MQS_RIGHT 0x120b0
+                               MX6SX_PAD_SD2_CMD__MQS_LEFT  0x120b0
+                       >;
+               };
+
                pinctrl_pcie: pciegrp {
                        fsl,pins = <
                                MX6SX_PAD_ENET1_COL__GPIO2_IO_0 0x10b0

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 659fcd3..109d3fa 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -581,6 +581,12 @@
                                gpio-ranges = <&iomuxc 0 148 10>, <&iomuxc 10 169 2>;
                        };
 
+                       mqs: mqs {
+                               compatible = "fsl,imx6sx-mqs";
+                               gpr = <&gpr>;
+                               status = "disabled";
+                       };
+
                        kpp: kpp@020b8000 {
                                compatible = "fsl,imx6sx-kpp", "fsl,imx21-kpp";
                                reg = <0x020b8000 0x4000>;