Unverified Commit efd0b166 authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown
Browse files

ASoC: fsl-asoc-card: Add support for WM8958 codec 



WM8958 codec is used on some i.MX based platform.
So add it support in this generic driver.

Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1615986303-27959-1-git-send-email-shengjiu.wang@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7a0d8849

sound/soc/fsl/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -291,6 +291,8 @@ config SND_SOC_FSL_ASOC_CARD 
	select SND_SOC_FSL_ESAI

	select SND_SOC_FSL_SAI

	select SND_SOC_FSL_SSI

	select SND_SOC_WM8994

	select MFD_WM8994

	help

	 ALSA SoC Audio support with ASRC feature for Freescale SoCs that have

	 ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888,

sound/soc/fsl/fsl-asoc-card.c

+15 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "../codecs/sgtl5000.h"

#include "../codecs/wm8962.h"

#include "../codecs/wm8960.h"

#include "../codecs/wm8994.h"



#define CS427x_SYSCLK_MCLK 0
@@ -37,12 +38,14 @@ 
/**

 * struct codec_priv - CODEC private data

 * @mclk_freq: Clock rate of MCLK

 * @free_freq: Clock rate of MCLK for hw_free()

 * @mclk_id: MCLK (or main clock) id for set_sysclk()

 * @fll_id: FLL (or secordary clock) id for set_sysclk()

 * @pll_id: PLL id for set_pll()

 */

struct codec_priv {

	unsigned long mclk_freq;

	unsigned long free_freq;

	u32 mclk_id;

	u32 fll_id;

	u32 pll_id;
@@ -235,10 +238,10 @@ static int fsl_asoc_card_hw_free(struct snd_pcm_substream *substream) 
	priv->streams &= ~BIT(substream->stream);



	if (!priv->streams && codec_priv->pll_id && codec_priv->fll_id) {

		/* Force freq to be 0 to avoid error message in codec */

		/* Force freq to be free_freq to avoid error message in codec */

		ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0),

					     codec_priv->mclk_id,

					     0,

					     codec_priv->free_freq,

					     SND_SOC_CLOCK_IN);

		if (ret) {

			dev_err(dev, "failed to switch away from FLL: %d\n", ret);
@@ -665,6 +668,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

		priv->card.dapm_routes = audio_map_rx;

		priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_rx);

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8958")) {

		codec_dai_name = "wm8994-aif1";

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		priv->codec_priv.mclk_id = WM8994_FLL_SRC_MCLK1;

		priv->codec_priv.fll_id = WM8994_SYSCLK_FLL1;

		priv->codec_priv.pll_id = WM8994_FLL1;

		priv->codec_priv.free_freq = priv->codec_priv.mclk_freq;

		priv->card.dapm_routes = NULL;

		priv->card.num_dapm_routes = 0;

	} else {

		dev_err(&pdev->dev, "unknown Device Tree compatible\n");

		ret = -EINVAL;
@@ -882,6 +894,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = { 
	{ .compatible = "fsl,imx-audio-mqs", },

	{ .compatible = "fsl,imx-audio-wm8524", },

	{ .compatible = "fsl,imx-audio-si476x", },

	{ .compatible = "fsl,imx-audio-wm8958", },

	{}

};

MODULE_DEVICE_TABLE(of, fsl_asoc_card_dt_ids);