aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZidan Wang <zidan.wang@freescale.com>2015-08-14 07:11:09 -0400
committerMark Brown <broonie@kernel.org>2015-08-15 12:21:28 -0400
commit50e0ee01382b8e08289d3db209738c5856fd25cf (patch)
tree3e6b67eb2774d1708f2aae2ea091d2587ca9a832
parent114bb13968162451f5e1d7fe793f9eb7e0083d9a (diff)
ASoC: fsl-asoc-card: add wm8960 support
add wm8960 support for fsl-asoc-card Signed-off-by: Zidan Wang <zidan.wang@freescale.com> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/fsl/fsl-asoc-card.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 040362fa1124..5aeb6ed4827e 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -23,6 +23,7 @@
23 23
24#include "../codecs/sgtl5000.h" 24#include "../codecs/sgtl5000.h"
25#include "../codecs/wm8962.h" 25#include "../codecs/wm8962.h"
26#include "../codecs/wm8960.h"
26 27
27#define RX 0 28#define RX 0
28#define TX 1 29#define TX 1
@@ -479,6 +480,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
479 priv->codec_priv.fll_id = WM8962_SYSCLK_FLL; 480 priv->codec_priv.fll_id = WM8962_SYSCLK_FLL;
480 priv->codec_priv.pll_id = WM8962_FLL; 481 priv->codec_priv.pll_id = WM8962_FLL;
481 priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; 482 priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
483 } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8960")) {
484 codec_dai_name = "wm8960-hifi";
485 priv->card.set_bias_level = fsl_asoc_card_set_bias_level;
486 priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO;
487 priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO;
488 priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
482 } else { 489 } else {
483 dev_err(&pdev->dev, "unknown Device Tree compatible\n"); 490 dev_err(&pdev->dev, "unknown Device Tree compatible\n");
484 return -EINVAL; 491 return -EINVAL;
@@ -582,6 +589,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = {
582 { .compatible = "fsl,imx-audio-cs42888", }, 589 { .compatible = "fsl,imx-audio-cs42888", },
583 { .compatible = "fsl,imx-audio-sgtl5000", }, 590 { .compatible = "fsl,imx-audio-sgtl5000", },
584 { .compatible = "fsl,imx-audio-wm8962", }, 591 { .compatible = "fsl,imx-audio-wm8962", },
592 { .compatible = "fsl,imx-audio-wm8960", },
585 {} 593 {}
586}; 594};
587 595