From: Mark Brown <broonie@kernel.org>
Date: Mon, 26 Oct 2015 02:16:03 +0000 (+0900)
Subject: Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f72362e6b7522040c16a224d5dcf2022e5468803;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic/fsl' and 'asoc/topic/fsl-card' into asoc-next
---

f72362e6b7522040c16a224d5dcf2022e5468803
diff --cc sound/soc/fsl/fsl-asoc-card.c
index 0901d5e20df2,5aeb6ed4827e,5aeb6ed4827e,97bb4c5544cd,33628a09fcf5..1b05d1c5d9fd
--- a/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 */