Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic...

diff --cc sound/soc/dwc/designware_i2s.c
Simple merge

diff --cc sound/soc/fsl/fsl-asoc-card.c
index 0901d5e20df2823c8cd19393007ed0ed946caf7f,5aeb6ed4827e821f0f0ec2cbc866ed1a99a73cc4,5aeb6ed4827e821f0f0ec2cbc866ed1a99a73cc4,97bb4c5544cdd24ae25ad0545db68affb082141f,33628a09fcf5121a730ecda8030fd9d75a61788e..1b05d1c5d9fd50fe32eb9b65f4da1340db9170e5
--- 1/sound/soc/fsl/fsl-asoc-card.c
--- 2/sound/soc/fsl/fsl-asoc-card.c
--- 3/sound/soc/fsl/fsl-asoc-card.c
--- 4/sound/soc/fsl/fsl-asoc-card.c
--- 5/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@@@@@ -486,12 -486,11 -486,11 -486,11 -533,21 +533,22 @@@@@@ static int fsl_asoc_card_probe(struct p
                priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO;
                priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO;
                priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
++++    } else if (of_device_is_compatible(np, "fsl,imx-audio-ac97")) {
++++            codec_dai_name = "ac97-hifi";
++++            priv->card.set_bias_level = NULL;
++++            priv->dai_fmt = SND_SOC_DAIFMT_AC97;
        } else {
                dev_err(&pdev->dev, "unknown Device Tree compatible\n");
 ----           return -EINVAL;
 ++++           ret = -EINVAL;
 ++++           goto asrc_fail;
 +++    }
 +++ 
++++    if (!fsl_asoc_card_is_ac97(priv) && !codec_dev) {
++++            dev_err(&pdev->dev, "failed to find codec device\n");
++++            ret = -EINVAL;
++++            goto asrc_fail;
+       }
+    
        /* Common settings for corresponding Freescale CPU DAI driver */
        if (strstr(cpu_np->name, "ssi")) {
                /* Only SSI needs to configure AUDMUX */

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge