Revert "ARM: dts: imx: use dual-fifo sdma script for ssi"

This reverts commit b1d27c79c8377df1880447375deffa3bb82c7bd3.

Previously we switched the SSI scriprt to dual-fifo mode to reduce playback
underrun issue, which is only included by SDMA firmware version 2. However,
there are quite a lot people still using version 1 or default firmware in
the ROM code of SoC while these two kinds of firmwares do not support the
dual-fifo script and the audio function on their platform would be broken.

Thus this patch provisionally reverts the dual-fifo script to the original
single fifo script to meet all kinds of users' requirements, including the
version 1/2 or inner ROM firmware.

Reported-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 5be28377d41f593fde0061cba80ca3cf5c466276..4bcdd3ad15e524d95cb553b47fc6f61e5eef9a3a 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -159,8 +159,8 @@
                                        reg = <0x70014000 0x4000>;
                                        interrupts = <30>;
                                        clocks = <&clks 49>;
-                                       dmas = <&sdma 24 22 0>,
-                                              <&sdma 25 22 0>;
+                                       dmas = <&sdma 24 1 0>,
+                                              <&sdma 25 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 7208fde9bc164b2f191c9b10d8ebe4c6b099729a..4307e80b2d2e386e53d48ee2080ca66df625565f 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -153,8 +153,8 @@
                                        reg = <0x50014000 0x4000>;
                                        interrupts = <30>;
                                        clocks = <&clks 49>;
-                                       dmas = <&sdma 24 22 0>,
-                                              <&sdma 25 22 0>;
+                                       dmas = <&sdma 24 1 0>,
+                                              <&sdma 25 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index e9534f2f53e7aab83e61304159881697478e06dc..fb28b2ecb1db37a28a9effbd7bea591ace78554a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -236,8 +236,8 @@
                                        reg = <0x02028000 0x4000>;
                                        interrupts = <0 46 0x04>;
                                        clocks = <&clks 178>;
-                                       dmas = <&sdma 37 22 0>,
-                                              <&sdma 38 22 0>;
+                                       dmas = <&sdma 37 1 0>,
+                                              <&sdma 38 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <38 37>;
@@ -249,8 +249,8 @@
                                        reg = <0x0202c000 0x4000>;
                                        interrupts = <0 47 0x04>;
                                        clocks = <&clks 179>;
-                                       dmas = <&sdma 41 22 0>,
-                                              <&sdma 42 22 0>;
+                                       dmas = <&sdma 41 1 0>,
+                                              <&sdma 42 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <42 41>;
@@ -262,8 +262,8 @@
                                        reg = <0x02030000 0x4000>;
                                        interrupts = <0 48 0x04>;
                                        clocks = <&clks 180>;
-                                       dmas = <&sdma 45 22 0>,
-                                              <&sdma 46 22 0>;
+                                       dmas = <&sdma 45 1 0>,
+                                              <&sdma 46 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <46 45>;

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 7b57fecd0bd51b534b662fcc50f7a303595eaf06..28558f1aaf2da8e67cb6b191f2d11e7964518b59 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -199,8 +199,8 @@
                                        reg = <0x02028000 0x4000>;
                                        interrupts = <0 46 0x04>;
                                        clocks = <&clks IMX6SL_CLK_SSI1>;
-                                       dmas = <&sdma 37 22 0>,
-                                              <&sdma 38 22 0>;
+                                       dmas = <&sdma 37 1 0>,
+                                              <&sdma 38 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        status = "disabled";
@@ -211,8 +211,8 @@
                                        reg = <0x0202c000 0x4000>;
                                        interrupts = <0 47 0x04>;
                                        clocks = <&clks IMX6SL_CLK_SSI2>;
-                                       dmas = <&sdma 41 22 0>,
-                                              <&sdma 42 22 0>;
+                                       dmas = <&sdma 41 1 0>,
+                                              <&sdma 42 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        status = "disabled";
@@ -223,8 +223,8 @@
                                        reg = <0x02030000 0x4000>;
                                        interrupts = <0 48 0x04>;
                                        clocks = <&clks IMX6SL_CLK_SSI3>;
-                                       dmas = <&sdma 45 22 0>,
-                                              <&sdma 46 22 0>;
+                                       dmas = <&sdma 45 1 0>,
+                                              <&sdma 46 1 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        status = "disabled";