Merge tag 'asoc-v3.15-3' into asoc-linus

ASoC: Updates for v3.15

A few more updates for the merge window:

 - Fixes for the simple-card DAI format DT mess.
 - A new driver for Cirrus cs42xx8 devices.
 - DT support for a couple more devices.
 - A revert of a previous buggy fix for soc-pcm, plus a few more fixes
   and cleanups.

# gpg: Signature made Sun 23 Mar 2014 16:56:11 GMT using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"

53 files changed, 1569 insertions, 207 deletions

diff --git a/Documentation/devicetree/bindings/sound/armada-370db-audio.txt b/Documentation/devicetree/bindings/sound/armada-370db-audio.txt
index 3893b4d15a20..bf984d238620 100644
--- a/Documentation/devicetree/bindings/sound/armada-370db-audio.txt
+++ b/Documentation/devicetree/bindings/sound/armada-370db-audio.txt
@@ -11,14 +11,17 @@ Mandatory properties:
  * marvell,audio-controller: a phandle that points to the audio
    controller of the Armada 370 SoC.
 
- * marvell,audio-codec: a phandle that points to the analog audio
-   codec connected to the Armada 370 SoC.
+ * marvell,audio-codec: a set of three phandles that points to:
+
+    1/ the analog audio codec connected to the Armada 370 SoC
+    2/ the S/PDIF transceiver
+    3/ the S/PDIF receiver
 
 Example:
 
         sound {
               compatible = "marvell,a370db-audio";
               marvell,audio-controller = <&audio_controller>;
-              marvell,audio-codec = <&audio_codec>;
+              marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>;
               status = "okay";
         };
diff --git a/Documentation/devicetree/bindings/sound/cs42xx8.txt b/Documentation/devicetree/bindings/sound/cs42xx8.txt
new file mode 100644
index 000000000000..f631fbca6284
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42xx8.txt
@@ -0,0 +1,28 @@
+CS42448/CS42888 audio CODEC
+
+Required properties:
+
+  - compatible : must contain one of "cirrus,cs42448" and "cirrus,cs42888"
+
+  - reg : the I2C address of the device for I2C
+
+  - clocks : a list of phandles + clock-specifiers, one for each entry in
+    clock-names
+
+  - clock-names : must contain "mclk"
+
+  - VA-supply, VD-supply, VLS-supply, VLC-supply: power supplies for the device,
+    as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+
+Example:
+
+codec: cs42888@48 {
+        compatible = "cirrus,cs42888";
+        reg = <0x48>;
+        clocks = <&codec_mclk 0>;
+        clock-names = "mclk";
+        VA-supply = <&reg_audio>;
+        VD-supply = <&reg_audio>;
+        VLS-supply = <&reg_audio>;
+        VLC-supply = <&reg_audio>;
+};
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
new file mode 100644
index 000000000000..7c6d33f29796
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -0,0 +1,96 @@
+Renesas R-Car sound
+
+Required properties:
+- compatible                    : "renesas,rcar_sound-gen1" if generation1
+                                  "renesas,rcar_sound-gen2" if generation2
+- reg                           : Should contain the register physical address.
+                                  required register is
+                                   SRU/ADG/SSI      if generation1
+                                   SRU/ADG/SSIU/SSI if generation2
+- rcar_sound,ssi                : SSI subnode
+- rcar_sound,scu                : SCU subnode
+- rcar_sound,dai                : DAI subnode
+
+SSI subnode properties:
+- interrupts                    : Should contain SSI interrupt for PIO transfer
+- shared-pin                    : if shared clock pin
+
+DAI subnode properties:
+- playback                      : list of playback modules
+- capture                       : list of capture  modules
+
+Example:
+
+rcar_sound: rcar_sound@0xffd90000 {
+        #sound-dai-cells = <1>;
+        compatible = "renesas,rcar_sound-gen2";
+        reg =   <0 0xec500000 0 0x1000>, /* SCU */
+                <0 0xec5a0000 0 0x100>,  /* ADG */
+                <0 0xec540000 0 0x1000>, /* SSIU */
+                <0 0xec541000 0 0x1280>; /* SSI */
+
+        rcar_sound,src {
+                src0: src@0 { };
+                src1: src@1 { };
+                src2: src@2 { };
+                src3: src@3 { };
+                src4: src@4 { };
+                src5: src@5 { };