Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1e43d93 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Support WM8994 mono AIF configurations 



The WM8994 supports mono signals - enable this in the driver. With DSP
mode an automatic data channel selector is available, activate this
when in mono mode.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent e4f078d8

sound/soc/codecs/wm8994.c

+15 −6
Original line number Diff line number Diff line
@@ -2099,10 +2099,12 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
	struct wm8994 *control = codec->control_data;

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);

	int aif1_reg;

	int aif2_reg;

	int bclk_reg;

	int lrclk_reg;

	int rate_reg;

	int aif1 = 0;

	int aif2 = 0;

	int bclk = 0;

	int lrclk = 0;

	int rate_val = 0;
@@ -2113,6 +2115,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
	switch (dai->id) {

	case 1:

		aif1_reg = WM8994_AIF1_CONTROL_1;

		aif2_reg = WM8994_AIF1_CONTROL_2;

		bclk_reg = WM8994_AIF1_BCLK;

		rate_reg = WM8994_AIF1_RATE;

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK ||
@@ -2125,6 +2128,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
		break;

	case 2:

		aif1_reg = WM8994_AIF2_CONTROL_1;

		aif2_reg = WM8994_AIF2_CONTROL_2;

		bclk_reg = WM8994_AIF2_BCLK;

		rate_reg = WM8994_AIF2_RATE;

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK ||
@@ -2180,6 +2184,10 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
	dev_dbg(dai->dev, "AIF%dCLK is %dHz, target BCLK %dHz\n",

		dai->id, wm8994->aifclk[id], bclk_rate);



	if (params_channels(params) == 1 &&

	    (snd_soc_read(codec, aif1_reg) & 0x18) == 0x18)

		aif2 |= WM8994_AIF1_MONO;



	if (wm8994->aifclk[id] == 0) {

		dev_err(dai->dev, "AIF%dCLK not configured\n", dai->id);

		return -EINVAL;
@@ -2223,6 +2231,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
		lrclk, bclk_rate / lrclk);



	snd_soc_update_bits(codec, aif1_reg, WM8994_AIF1_WL_MASK, aif1);

	snd_soc_update_bits(codec, aif2_reg, WM8994_AIF1_MONO, aif2);

	snd_soc_update_bits(codec, bclk_reg, WM8994_AIF1_BCLK_DIV_MASK, bclk);

	snd_soc_update_bits(codec, lrclk_reg, WM8994_AIF1DAC_RATE_MASK,

			    lrclk);
@@ -2378,14 +2387,14 @@ static struct snd_soc_dai_driver wm8994_dai[] = { 
		.id = 1,

		.playback = {

			.stream_name = "AIF1 Playback",

			.channels_min = 2,

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM8994_RATES,

			.formats = WM8994_FORMATS,

		},

		.capture = {

			.stream_name = "AIF1 Capture",

			.channels_min = 2,

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM8994_RATES,

			.formats = WM8994_FORMATS,
@@ -2397,14 +2406,14 @@ static struct snd_soc_dai_driver wm8994_dai[] = { 
		.id = 2,

		.playback = {

			.stream_name = "AIF2 Playback",

			.channels_min = 2,

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM8994_RATES,

			.formats = WM8994_FORMATS,

		},

		.capture = {

			.stream_name = "AIF2 Capture",

			.channels_min = 2,

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM8994_RATES,

			.formats = WM8994_FORMATS,
@@ -2416,14 +2425,14 @@ static struct snd_soc_dai_driver wm8994_dai[] = { 
		.id = 3,

		.playback = {

			.stream_name = "AIF3 Playback",

			.channels_min = 2,

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM8994_RATES,

			.formats = WM8994_FORMATS,

		},

		.capture = {

			.stream_name = "AIF3 Capture",

			.channels_min = 2,

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM8994_RATES,

			.formats = WM8994_FORMATS,