Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/fsl-card' and 'asoc...

diff --combined Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
index 4da41bf1888e9baaf2471a73db7d8019be9d6d0c,ce55c0a6f7578ee192a207a6b247095d605072b8,943b36d1b81b62e5eb53ae5a92707b1ea3c645fa,ce55c0a6f7578ee192a207a6b247095d605072b8..ceaef512698967ff16677b3771d2fd8c5227aaac
--- 1/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
--- 2/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
--- 3/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
--- 4/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
@@@@@ -24,14 -24,12 -24,15 -24,12 +24,17 @@@@@ The compatible list for this generic so
    
     "fsl,imx-audio-cs42888"
    
++ + "fsl,imx-audio-cs427x"
++ + (compatible with CS4271 and CS4272)
++ +
     "fsl,imx-audio-wm8962"
     (compatible with Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt)
    
     "fsl,imx-audio-sgtl5000"
     (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)
    
 +++ "fsl,imx-audio-wm8960"
 +++
    Required properties:
    
      - compatible              : Contains one of entries in the compatible list.
@@@@@ -63,6 -61,6 -64,12 -61,6 +66,12 @@@@@ Optional properties
      - audio-asrc              : The phandle of ASRC. It can be absent if there's no
                          need to add ASRC support via DPCM.
    
++ +Optional unless SSI is selected as a CPU DAI:
++ +
++ +  - mux-int-port    : The internal port of the i.MX audio muxer (AUDMUX)
++ +
++ +  - mux-ext-port    : The external port of the i.MX audio muxer
++ +
    Example:
    sound-cs42888 {
        compatible = "fsl,imx-audio-cs42888";