ASoC: bdw-rt5650: incorrect rate of PCM data
Subsystems (3)
PATCH 1/1 ASoC: bdw-rt5650: incorrect rate of PCM data
Implement a constrain to exclude 3-channel capture since only 2 and 4 channel capture are supported on the platform.
--- sound/soc/intel/boards/bdw-rt5650.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
sound/soc/intel/boards/bdw-rt5650.c +31 -0
@@ -83,6 +83,36 @@ static struct snd_soc_jack_pin mic_jack_pin = { .mask = SND_JACK_MICROPHONE, }; +static const unsigned int channels[] = { +2 ,4 , +}; + +static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count =ARRAY_SIZE (channels), + .list = channels, + .mask =0 , +}; + +static int bdw_fe_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + +/* +* On this platform for PCM device we support, +* 2 or 4 channel capture +*/ +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) +snd_pcm_hw_constraint_list (runtime,0 , +SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_channels); + +return 0 ; +} + +static const struct snd_soc_ops bdw_rt5650_fe_ops = { + .startup = bdw_fe_startup, +}; +static int broadwell_ssp0_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {
@@ -234,6 +264,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .name = "System PCM", .stream_name = "System Playback", .dynamic = 1, + .ops = &bdw_rt5650_fe_ops,#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) .init = bdw_rt5650_rtd_init,#endif
Signature · 1 line
2.7.4
Quoted 2 lines · Brent Lu
Implement a constrain to exclude 3-channel capture since only 2 and 4 channel capture are supported on the platform.
The patch looks good to me, except that the subject seems unrelated? you are changing the channel number, not the sample rate?
Thanks,
~Keyon
Quoted 56 lines
Signed-off-by Brent Lu <[email protected]>--- sound/soc/intel/boards/bdw-rt5650.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)sound/soc/intel/boards/bdw-rt5650.c +31
-0@@ -83,6 +83,36 @@ static struct snd_soc_jack_pin mic_jack_pin = { .mask = SND_JACK_MICROPHONE, }; +static const unsigned int channels[] = { +2 ,4 , +}; + +static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count =ARRAY_SIZE (channels), + .list = channels, + .mask =0 , +}; + +static int bdw_fe_startup (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; + +/* +* On this platform for PCM device we support, +* 2 or 4 channel capture +*/ +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) +snd_pcm_hw_constraint_list (runtime,0 , +SNDRV_PCM_HW_PARAM_CHANNELS , + &constraints_channels); + +return 0 ; +} + +static const struct snd_soc_ops bdw_rt5650_fe_ops = { + .startup = bdw_fe_startup, +}; +static int broadwell_ssp0_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {@@ -234,6 +264,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .name = "System PCM", .stream_name = "System Playback", .dynamic = 1, + .ops = &bdw_rt5650_fe_ops,#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) .init = bdw_rt5650_rtd_init,#endif
Quoted 7 lines
The patch looks good to me, except that the subject seems unrelated? you are changing the channel number, not the sample rate?
Thanks,
~Keyon
Oops. The title is misleading. Google is using a program called alsa_conformance_test to measure the data rate of all available audio configuration. The rate is incorrect for 3-channel capture because BDW does not support it. Therefore, a constraint is implemented here to remove the 3-channel capture support. I will upload a patch with a more proper title.
Regards,
Brent