diff options
| author | Zidan Wang <zidan.wang@freescale.com> | 2015-08-14 19:11:09 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-15 09:21:28 -0700 |
| commit | 50e0ee01382b8e08289d3db209738c5856fd25cf (patch) | |
| tree | 3e6b67eb2774d1708f2aae2ea091d2587ca9a832 | |
| parent | 114bb13968162451f5e1d7fe793f9eb7e0083d9a (diff) | |
| download | linux-stable-50e0ee01382b8e08289d3db209738c5856fd25cf.tar.gz linux-stable-50e0ee01382b8e08289d3db209738c5856fd25cf.tar.bz2 linux-stable-50e0ee01382b8e08289d3db209738c5856fd25cf.zip | |
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.c | 8 |
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 @@ #include "../codecs/sgtl5000.h" #include "../codecs/wm8962.h" +#include "../codecs/wm8960.h" #define RX 0 #define TX 1 @@ -479,6 +480,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->codec_priv.fll_id = WM8962_SYSCLK_FLL; priv->codec_priv.pll_id = WM8962_FLL; priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8960")) { + codec_dai_name = "wm8960-hifi"; + priv->card.set_bias_level = fsl_asoc_card_set_bias_level; + 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 { dev_err(&pdev->dev, "unknown Device Tree compatible\n"); return -EINVAL; @@ -582,6 +589,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = { { .compatible = "fsl,imx-audio-cs42888", }, { .compatible = "fsl,imx-audio-sgtl5000", }, { .compatible = "fsl,imx-audio-wm8962", }, + { .compatible = "fsl,imx-audio-wm8960", }, {} }; |