Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	arch/arm/boot/dts/imx51.dtsi
	arch/arm/boot/dts/imx53.dtsi

diff --cc arch/arm/boot/dts/imx51.dtsi
index 3291e553c4fd2639066ed80903371731ad40088e,5be28377d41f593fde0061cba80ca3cf5c466276..61a2552747a322508caff97fa2d261f24b25b014
--- 1/arch/arm/boot/dts/imx51.dtsi
--- 2/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@@ -183,9 -158,9 +183,9 @@@
                                        compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
                                        reg = <0x70014000 0x4000>;
                                        interrupts = <30>;
 -                                      clocks = <&clks 49>;
 +                                      clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
-                                       dmas = <&sdma 24 1 0>,
-                                              <&sdma 25 1 0>;
+                                       dmas = <&sdma 24 22 0>,
+                                              <&sdma 25 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */

diff --cc arch/arm/boot/dts/imx53.dtsi
index 4dbde252e8a56b8e90c72b3328c578bd1e62692d,7208fde9bc164b2f191c9b10d8ebe4c6b099729a..64075260ad1b0462c57ff23b49c7f59c420827db
--- 1/arch/arm/boot/dts/imx53.dtsi
--- 2/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@@ -174,9 -152,9 +174,9 @@@
                                        compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
                                        reg = <0x50014000 0x4000>;
                                        interrupts = <30>;
 -                                      clocks = <&clks 49>;
 +                                      clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
-                                       dmas = <&sdma 24 1 0>,
-                                              <&sdma 25 1 0>;
+                                       dmas = <&sdma 24 22 0>,
+                                              <&sdma 25 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */

diff --cc arch/arm/boot/dts/imx6qdl.dtsi
index 8a865024d4583f8a3501389ad7e3ac8239447b50,e9534f2f53e7aab83e61304159881697478e06dc..da0d843fbb67aedb0e3c6dded9abe0b164775aaf
--- 1/arch/arm/boot/dts/imx6qdl.dtsi
--- 2/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@@ -249,10 -234,10 +249,10 @@@
                                ssi1: ssi@02028000 {
                                        compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
                                        reg = <0x02028000 0x4000>;
 -                                      interrupts = <0 46 0x04>;
 +                                      interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks 178>;
-                                       dmas = <&sdma 37 1 0>,
-                                              <&sdma 38 1 0>;
+                                       dmas = <&sdma 37 22 0>,
+                                              <&sdma 38 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <38 37>;
@@@ -262,10 -247,10 +262,10 @@@
                                ssi2: ssi@0202c000 {
                                        compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
                                        reg = <0x0202c000 0x4000>;
 -                                      interrupts = <0 47 0x04>;
 +                                      interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks 179>;
-                                       dmas = <&sdma 41 1 0>,
-                                              <&sdma 42 1 0>;
+                                       dmas = <&sdma 41 22 0>,
+                                              <&sdma 42 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <42 41>;
@@@ -275,10 -260,10 +275,10 @@@
                                ssi3: ssi@02030000 {
                                        compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
                                        reg = <0x02030000 0x4000>;
 -                                      interrupts = <0 48 0x04>;
 +                                      interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks 180>;
-                                       dmas = <&sdma 45 1 0>,
-                                              <&sdma 46 1 0>;
+                                       dmas = <&sdma 45 22 0>,
+                                              <&sdma 46 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        fsl,ssi-dma-events = <46 45>;

diff --cc arch/arm/boot/dts/imx6sl.dtsi
index a5ef3c30b164e4c2c6ab4323dbc35ed1f73eb20a,7b57fecd0bd51b534b662fcc50f7a303595eaf06..fcefa1c9f281ae9a983131245540b50a247e8037
--- 1/arch/arm/boot/dts/imx6sl.dtsi
--- 2/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@@ -228,10 -197,10 +228,10 @@@
                                ssi1: ssi@02028000 {
                                        compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
                                        reg = <0x02028000 0x4000>;
 -                                      interrupts = <0 46 0x04>;
 +                                      interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6SL_CLK_SSI1>;
-                                       dmas = <&sdma 37 1 0>,
-                                              <&sdma 38 1 0>;
+                                       dmas = <&sdma 37 22 0>,
+                                              <&sdma 38 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        status = "disabled";
@@@ -240,10 -209,10 +240,10 @@@
                                ssi2: ssi@0202c000 {
                                        compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
                                        reg = <0x0202c000 0x4000>;
 -                                      interrupts = <0 47 0x04>;
 +                                      interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6SL_CLK_SSI2>;
-                                       dmas = <&sdma 41 1 0>,
-                                              <&sdma 42 1 0>;
+                                       dmas = <&sdma 41 22 0>,
+                                              <&sdma 42 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        status = "disabled";
@@@ -252,10 -221,10 +252,10 @@@
                                ssi3: ssi@02030000 {
                                        compatible = "fsl,imx6sl-ssi","fsl,imx21-ssi";
                                        reg = <0x02030000 0x4000>;
 -                                      interrupts = <0 48 0x04>;
 +                                      interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6SL_CLK_SSI3>;
-                                       dmas = <&sdma 45 1 0>,
-                                              <&sdma 46 1 0>;
+                                       dmas = <&sdma 45 22 0>,
+                                              <&sdma 46 22 0>;
                                        dma-names = "rx", "tx";
                                        fsl,fifo-depth = <15>;
                                        status = "disabled";

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/pl330.c
Simple merge