Applied "ASoC: Intel: update bxt_da7219_max98357a to support quad ch dmic capture" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: Intel: update bxt_da7219_max98357a to support quad ch dmic capture
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
c1aee1d828caa86a663c57a56eead7fd5f22d80fMon Sep 17 00:00:00 2001
From: Sathyanarayana Nujella <[email protected]>
Date: Tue, 6 Dec 2016 07:08:36 -0800
Subject: [PATCH] ASoC: Intel: update bxt_da7219_max98357a to support quad ch
dmic capture
This patch updates FE channel constraints & BE fixup to support quad channel DMIC capture.
DMIC pin's BE fixup is configured based on channel input, i.e. either stereo or quad.
--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
sound/soc/intel/boards/bxt_da7219_max98357a.c +17 -3
@@ -30,6 +30,7 @@#define BXT_DIALOG_CODEC_DAI "da7219-hifi"#define BXT_MAXIM_CODEC_DAI "HiFi"#define DUAL_CHANNEL 2 +#define QUAD_CHANNEL 4static struct snd_soc_jack broxton_headset;
@@ -182,6 +183,16 @@ static struct snd_pcm_hw_constraint_list constraints_channels = { .mask = 0, }; +static unsigned int channels_quad[] = { +QUAD_CHANNEL , +}; + +static struct snd_pcm_hw_constraint_list constraints_channels_quad = { + .count =ARRAY_SIZE (channels_quad), + .list = channels_quad, + .mask =0 , +}; +static int bxt_fe_startup (struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime;
@@ -258,7 +269,10 @@ static int broxton_dmic_fixup(struct snd_soc_pcm_runtime *rtd, {struct snd_interval *channels =hw_param_interval (params,SNDRV_PCM_HW_PARAM_CHANNELS ); - channels->min = channels->max =DUAL_CHANNEL ; +if (params_channels (params) ==2 ) + channels->min = channels->max =2 ; +else + channels->min = channels->max =4 ;return 0 ; }
@@ -267,9 +281,9 @@ static int broxton_dmic_startup(struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; - runtime->hw.channels_max =DUAL_CHANNEL ; + runtime->hw.channels_min = runtime->hw.channels_max =QUAD_CHANNEL ;snd_pcm_hw_constraint_list (runtime,0 ,SNDRV_PCM_HW_PARAM_CHANNELS , - &constraints_channels); + &constraints_channels_quad);return snd_pcm_hw_constraint_list (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_RATE , &constraints_rates);
Signature · 1 line
2.10.2