ASoC: img: Add split i2s-in

Add split i2s-in support.

Not suitable for upstream due to incompatibilies with ALSA
framework

Change-Id: Ib16f63053536b9e35aa7b2b711589da8efbeafca
Signed-off-by: Damien.Horsley <Damien.Horsley@imgtec.com>

2 files changed, 47 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/sound/img,i2s-in.txt b/Documentation/devicetree/bindings/sound/img,i2s-in.txt
index a9e3c862a94..76277d4a380 100644
--- a/Documentation/devicetree/bindings/sound/img,i2s-in.txt
+++ b/Documentation/devicetree/bindings/sound/img,i2s-in.txt
@@ -4,7 +4,9 @@ Required Properties:
 
   - compatible : Compatible list, must contain "img,i2s-in"
 
-  - #sound-dai-cells : Must be equal to 0
+  - #sound-dai-cells : Must be equal to 1
+
+  - #sound-platform-cells : Must be equal to 1
 
   - reg : Offset and length of the register set for the device
 
@@ -15,13 +17,34 @@ Required Properties:
 
   - dmas: Contains an entry for each entry in dma-names.
 
-  - dma-names: Must include the following entry:
-	"rx"	Single DMA channel used by all active I2S channels
+  - dma-names: Must include one or both of the following:
+	"rx"					Shared DMA channel
+	"rxN" for N=0..img,i2s-channels - 1	Per-channel DMA
 
   - img,i2s-channels : Number of I2S channels instantiated in the I2S in block
 
+  - img,cr-periph : Must contain a phandle to the peripheral control syscon
+                    node which contains the alternate i2s control registers
+
 Optional Properties:
 
+  - img,clock-master : Contains bitmask for clock master configuration. One
+		       bit per i2s channel for channels 0-3. 4/5 cannot be
+		       modified and always use MFIO47/MFIO48. If omitted,
+		       all channels will use MFIO47/MFIO48
+
+	0 -> MFIO47 = bit clock, MFIO48 = left/right clock
+	1 -> MFIO11 = bit clock, MFIO12 = left/right clock
+
+  - img,shared-dma : Contains number of channels to combine for use with the
+		     shared DMA channel. If this is not equal to the value
+		     specified in img,i2s-channels, per-channel dma references
+		     must exist for the remaining channels. If this is equal
+		     to zero, the shared dma channel reference can be ommitted.
+		     The combined channels must share the same bit and
+		     left/right clock. If omitted, all channels will combined
+		     for use with the shared DMA channel
+
   - interrupts : Contains the I2S in interrupts. Depending on
 	the configuration, there may be no interrupts, one interrupt,
 	or an interrupt per I2S channel
@@ -36,10 +59,22 @@ i2s_in: i2s-in@18100800 {
 	compatible = "img,i2s-in";
 	reg = <0x18100800 0x200>;
 	interrupts = <GIC_SHARED 7 IRQ_TYPE_LEVEL_HIGH>;
-	dmas = <&mdc 30 0xffffffff 0>;
-	dma-names = "rx";
 	clocks = <&cr_periph SYS_CLK_I2S_IN>;
 	clock-names = "sys";
 	img,i2s-channels = <6>;
-	#sound-dai-cells = <0>;
+	img,cr-periph = <&cr_periph>;
+	img,clock-master = <0xf>;
+	img,shared-dma = <3>;
+	dmas =  <&mdc 30 0xffffffff 0>,
+		<&mdc 24 0xffffffff 0>,
+		<&mdc 25 0xffffffff 0>,
+		<&mdc 26 0xffffffff 0>,
+		<&mdc 27 0xffffffff 0>,
+		<&mdc 28 0xffffffff 0>,
+		<&mdc 29 0xffffffff 0>;
+	dma-names = "rx", "rx0", "rx1", "rx2",
+		    "rx3", "rx4", "rx5";
+
+	#sound-dai-cells = <1>;
+	#sound-platform-cells = <1>;
 };
diff --git a/Documentation/devicetree/bindings/sound/img,pistachio-audio.txt b/Documentation/devicetree/bindings/sound/img,pistachio-audio.txt
index ea0e041986c..4cdbf2e579a 100644
--- a/Documentation/devicetree/bindings/sound/img,pistachio-audio.txt
+++ b/Documentation/devicetree/bindings/sound/img,pistachio-audio.txt
@@ -45,6 +45,8 @@ Optional subnodes:
 
   - i2s-in : Contains i2s in information
 
+  - i2s-in-alt : Contains i2s in (alternate interface) information
+
 Required spdif-out subnode properties:
 
   - cpu-dai : phandle of spdif out cpu dai
@@ -86,14 +88,14 @@ Optional i2s-out subnodes:
 		   cannot be equal to "internal-dac" or "tpa6130a2". The name
 		   should be short to avoid control name truncation
 
-Required i2s-in subnode properties:
+Required i2s-in, i2s-in-alt subnode properties:
 
-  - cpu-dai : phandle of i2s in cpu dai
+  - cpu-dais : array of phandles of i2s in cpu dais
 
   - format : i2s in format. "i2s" and "left_j" are supported by
 	     the Pistachio iteration of the i2s in controller
 
-Optional i2s-in subnode properties:
+Optional i2s-in, i2s-in-alt subnode properties:
 
   - bitclock-inversion : i2s out BCLK inversion
 
@@ -101,7 +103,7 @@ Optional i2s-in subnode properties:
 
   - continuous-clock : i2s out BCLK and LRCLK always active
 
-Optional i2s-in subnodes:
+Optional i2s-in, i2s-in-alt subnodes:
 
   - <codec-name> : Contains codec information. <codec-name> will be used as
 		   the prefix for the codec. This name must be unique for