From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Dec 2013 00:22:57 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20131213~58
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=752188a6830ec6f9f2a3b6c69356cf28c206c77b;p=karo-tx-linux.git

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

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

752188a6830ec6f9f2a3b6c69356cf28c206c77b
diff --cc arch/arm/boot/dts/imx51.dtsi
index 3291e553c4fd,5be28377d41f..61a2552747a3
--- a/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 90359da564ce,7208fde9bc16..175a94cff749
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@@ -172,9 -152,9 +172,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 081606791f51,995bad2ed162..16f69741177e
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@@ -237,10 -234,10 +237,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>;
@@@ -250,10 -247,10 +250,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>;
@@@ -263,10 -260,10 +263,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 a4d88d000b2f,7b57fecd0bd5..b526118b6fe9
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@@ -199,10 -197,10 +199,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";
@@@ -211,10 -209,10 +211,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";
@@@ -223,10 -221,10 +223,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";