ENGR00310878-2 ASoC: fsl_esai: cherry-pick from upstream and merge to mainline

cherry-picked commit is 43d24e76b69826ce32292f47060ad78cdd0197fa
Header of this commit is "ASoC: fsl_esai: Add ESAI CPU DAI driver", use upstream
driver to replace current one.

Merged feature is:
1. Move setting of PRRC and PCRC to the end of hw_params, and disable it in
shutdown function.
2. Merged the xrun handler with this commit.
3. Use dma init with NO_RESIDUE|NO_DT|COMPAT.
4. Add spba clock for ESAI

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

2 files changed, 50 insertions, 26 deletions

diff --git a/Documentation/devicetree/bindings/sound/fsl,esai.txt b/Documentation/devicetree/bindings/sound/fsl,esai.txt
new file mode 100644
index 000000000000..d7b99fa637b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/fsl,esai.txt
@@ -0,0 +1,50 @@
+Freescale Enhanced Serial Audio Interface (ESAI) Controller
+
+The Enhanced Serial Audio Interface (ESAI) provides a full-duplex serial port
+for serial communication with a variety of serial devices, including industry
+standard codecs, Sony/Phillips Digital Interface (S/PDIF) transceivers, and
+other DSPs. It has up to six transmitters and four receivers.
+
+Required properties:
+
+  - compatible : Compatible list, must contain "fsl,imx35-esai".
+
+  - reg : Offset and length of the register set for the device.
+
+  - interrupts : Contains the spdif interrupt.
+
+  - dmas : Generic dma devicetree binding as described in
+  Documentation/devicetree/bindings/dma/dma.txt.
+
+  - dma-names : Two dmas have to be defined, "tx" and "rx".
+
+  - clocks: Contains an entry for each entry in clock-names.
+
+  - clock-names : Includes the following entries:
+	"core"		The core clock used to access registers
+	"extal"		The esai baud clock for esai controller used to derive
+			HCK, SCK and FS.
+	"fsys"		The system clock derived from ahb clock used to derive
+			HCK, SCK and FS.
+
+  - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs.
+    This number is the maximum allowed value for TFCR[TFWM] or RFCR[RFWM].
+
+  - fsl,esai-synchronous: This is a boolean property. If present, indicating
+    that ESAI would work in the synchronous mode, which means all the settings
+    for Receiving would be duplicated from Transmition related registers.
+
+Example:
+
+esai: esai@02024000 {
+	compatible = "fsl,imx35-esai";
+	reg = <0x02024000 0x4000>;
+	interrupts = <0 51 0x04>;
+	clocks = <&clks 208>, <&clks 118>, <&clks 208>;
+	clock-names = "core", "extal", "fsys";
+	dmas = <&sdma 23 21 0>, <&sdma 24 21 0>;
+	dma-names = "rx", "tx";
+	fsl,fifo-depth = <128>;
+	fsl,esai-synchronous;
+	status = "disabled";
+};
diff --git a/Documentation/devicetree/bindings/sound/fsl-easi.txt b/Documentation/devicetree/bindings/sound/fsl-easi.txt
deleted file mode 100644
index b6196622accd..000000000000
--- a/Documentation/devicetree/bindings/sound/fsl-easi.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-* Freescale Enhanced Serial Audio Interface (ESAI)
-
-Required properties:
-  - compatible: Should be "fsl,<chip>-esai".
-  - reg: Offset and length of the register set for the device.
-  - interrupts: Contains ESAI interrupt.
-  - clocks: Contains an entry for each entry in clock-names.
-  - fsl,fifo-depth: The number of elements in the transmit and receive FIFOs.
-                    This number is the maximum allowed value for TFCR[TFWM].
-  - fsl,esai-dma-events: The dma event of the esai, <a b>, a is the tx dma.
-			 b is the rx dma.
-  - fsl,flags: <1> is for ESAI network mode, <2> is for ESAI SYNC mode.
-	       <3> is for network and SYNC mode.
-
-Example:
-
-esai: esai@02024000 {
-	compatible = "fsl,imx6q-esai";
-	reg = <0x02024000 0x4000>;
-	interrupts = <0 51 0x04>;
-	clocks = <&clks 118>;
-	fsl,fifo-depth = <128>;
-	fsl,esai-dma-events = <24 23>;
-	fsl,flags = <1>;
-	status = "disabled";
-};